Renamed option

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 83897eb9db66fe61fd3dd1192c84360f62089ba3..e509395f4c9b8d700b89694d43e7a89e33eb1a7d 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -615,9 +615,9 @@ no:!cache_source_memcached_host]]></enableoptions>
                                <categoryname>message.attachment</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue><![CDATA[1]]></defaultvalue>
-                               <enableoptions>attachment_obtain_dimensions,attachment_thumbnail_height,attachment_thumbnail_width</enableoptions>
+                               <enableoptions>attachment_retain_dimensions,attachment_thumbnail_height,attachment_thumbnail_width</enableoptions>
                        </option>
-                       <option name="attachment_obtain_dimensions">
+                       <option name="attachment_retain_dimensions">
                                <categoryname>message.attachment</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue><![CDATA[0]]></defaultvalue>

diff --git a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
index 72e0921f3011215325b3a27a5c76051fe966dbe4..681ecb1c63d90d33079a44f17403a8883a735e7d 100644 (file)
--- a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
+++ b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php
@@ -282,7 +282,7 @@ class AttachmentAction extends AbstractDatabaseObjectAction {
                        // create standard thumbnail
                        if ($attachment->width > ATTACHMENT_THUMBNAIL_WIDTH || $attachment->height > ATTACHMENT_THUMBNAIL_HEIGHT) {
                                $thumbnailLocation = $attachment->getThumbnailLocation();
-                               $thumbnail = $adapter->createThumbnail(ATTACHMENT_THUMBNAIL_WIDTH, ATTACHMENT_THUMBNAIL_HEIGHT, ATTACHMENT_OBTAIN_DIMENSIONS);
+                               $thumbnail = $adapter->createThumbnail(ATTACHMENT_THUMBNAIL_WIDTH, ATTACHMENT_THUMBNAIL_HEIGHT, ATTACHMENT_RETAIN_DIMENSIONS);
                                $adapter->writeImage($thumbnail, $thumbnailLocation);
                                if (file_exists($thumbnailLocation) && ($imageData = @getImageSize($thumbnailLocation)) !== false) {
                                        $updateData['thumbnailType'] = $imageData['mime'];

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f8dfb27a69807602f5a420734d063a3941a24c51..803b82d2959408ed412d8feeea04b731e2401c93 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -706,7 +706,7 @@
                <item name="wcf.acp.option.recaptcha_privatekey"><![CDATA[Private-API-Key]]></item>
                <item name="wcf.acp.option.category.message.attachment"><![CDATA[Dateianhänge]]></item>
                <item name="wcf.acp.option.attachment_enable_thumbnails"><![CDATA[Vorschaugrafiken von hochgeladenen Bilder erzeugen]]></item>
-               <item name="wcf.acp.option.attachment_obtain_dimensions"><![CDATA[Bildformat beim Erzeugen von Vorschaugrafiken beibehalten]]></item>
+               <item name="wcf.acp.option.attachment_retain_dimensions"><![CDATA[Bildformat beim Erzeugen von Vorschaugrafiken beibehalten]]></item>
                <item name="wcf.acp.option.attachment_thumbnail_height"><![CDATA[Höhe der Vorschaugrafiken]]></item>
                <item name="wcf.acp.option.attachment_thumbnail_width"><![CDATA[Breite der Vorschaugrafiken]]></item>
                <item name="wcf.acp.option.attachment_storage"><![CDATA[Speicherort der Dateianhänge]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 191d0a46f8d22db492db38802a18346a0ddc7241..5230bcfae7c4bbc6e72cf150a576701403646489 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -705,7 +705,7 @@ Examples for medium ID detection:
                <item name="wcf.acp.option.recaptcha_privatekey"><![CDATA[Private API Key]]></item>
                <item name="wcf.acp.option.category.message.attachment"><![CDATA[Attachments]]></item>
                <item name="wcf.acp.option.attachment_enable_thumbnails"><![CDATA[Create thumbnails for uploaded images]]></item>
-               <item name="wcf.acp.option.attachment_obtain_dimensions"><![CDATA[Obtain thumbnail dimensions]]></item>
+               <item name="wcf.acp.option.attachment_retain_dimensions"><![CDATA[Retain thumbnail dimensions]]></item>
                <item name="wcf.acp.option.attachment_thumbnail_height"><![CDATA[Thumbnail Height in Pixel]]></item>
                <item name="wcf.acp.option.attachment_thumbnail_width"><![CDATA[Thumbnail Width in Pixel]]></item>
                <item name="wcf.acp.option.attachment_storage"><![CDATA[Storage Location]]></item>