From d36e50c54e4324f0badc0d95d6530771f7abd6a3 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 22 Dec 2015 21:17:48 +0100
Subject: [PATCH] Fix some issues

---
 com.woltlab.wcf/option.xml                                | 6 ++++++
 com.woltlab.wcf/templates/languageChooser.tpl             | 2 +-
 wcfsetup/install/files/acp/templates/languageChooser.tpl  | 2 +-
 .../files/js/3rdParty/redactor2/plugins/WoltLabMedia.js   | 4 ++--
 .../install/files/js/WoltLab/WCF/Attachment/Upload.js     | 8 +++++---
 .../system/upload/DefaultUploadFileSaveStrategy.class.php | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index f09b7fd1da..a535aadd4a 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1489,6 +1489,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 				<defaultvalue>280</defaultvalue> <!-- TODO: temporary value -->
 				<minvalue>145</minvalue> <!-- TODO: temporary value -->
 				<maxvalue>400</maxvalue> <!-- TODO: temporary value -->
+				<suffix>pixel</suffix>
 			</option>
 			<option name="media_small_thumbnail_height">
 				<categoryname>cms.media.thumbnail</categoryname>
@@ -1496,6 +1497,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 				<defaultvalue>210</defaultvalue> <!-- TODO: temporary value -->
 				<minvalue>145</minvalue> <!-- TODO: temporary value -->
 				<maxvalue>300</maxvalue> <!-- TODO: temporary value -->
+				<suffix>pixel</suffix>
 			</option>
 			<option name="media_small_thumbnail_retain_dimensions">
 				<categoryname>cms.media.thumbnail</categoryname>
@@ -1508,6 +1510,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 				<defaultvalue>560</defaultvalue> <!-- TODO: temporary value -->
 				<minvalue>400</minvalue> <!-- TODO: temporary value -->
 				<maxvalue>900</maxvalue> <!-- TODO: temporary value -->
+				<suffix>pixel</suffix>
 			</option>
 			<option name="media_medium_thumbnail_height">
 				<categoryname>cms.media.thumbnail</categoryname>
@@ -1515,6 +1518,7 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 				<defaultvalue>420</defaultvalue> <!-- TODO: temporary value -->
 				<minvalue>300</minvalue> <!-- TODO: temporary value -->
 				<maxvalue>700</maxvalue> <!-- TODO: temporary value -->
+				<suffix>pixel</suffix>
 			</option>
 			<option name="media_medium_thumbnail_retain_dimensions">
 				<categoryname>cms.media.thumbnail</categoryname>
@@ -1526,12 +1530,14 @@ DESC:wcf.global.sortOrder.descending]]></selectoptions>
 				<optiontype>integer</optiontype>
 				<defaultvalue>1200</defaultvalue> <!-- TODO: temporary value -->
 				<minvalue>900</minvalue> <!-- TODO: temporary value -->
+				<suffix>pixel</suffix>
 			</option>
 			<option name="media_large_thumbnail_height">
 				<categoryname>cms.media.thumbnail</categoryname>
 				<optiontype>integer</optiontype>
 				<defaultvalue>900</defaultvalue> <!-- TODO: temporary value -->
 				<minvalue>700</minvalue> <!-- TODO: temporary value -->
+				<suffix>pixel</suffix>
 			</option>
 			<option name="media_large_thumbnail_retain_dimensions">
 				<categoryname>cms.media.thumbnail</categoryname>
diff --git a/com.woltlab.wcf/templates/languageChooser.tpl b/com.woltlab.wcf/templates/languageChooser.tpl
index c75dfaa79c..b22a59d60b 100644
--- a/com.woltlab.wcf/templates/languageChooser.tpl
+++ b/com.woltlab.wcf/templates/languageChooser.tpl
@@ -19,7 +19,7 @@
 			var languages = {
 				{implode from=$languages item=__language}
 					'{@$__language->languageID}': {
-						iconPath: '{@$__language->getIconPath()}',
+						iconPath: '{@$__language->getIconPath()|encodeJS}',
 						languageName: '{$__language}'
 					}
 				{/implode}
diff --git a/wcfsetup/install/files/acp/templates/languageChooser.tpl b/wcfsetup/install/files/acp/templates/languageChooser.tpl
index ddbeb076e2..8e522e106b 100644
--- a/wcfsetup/install/files/acp/templates/languageChooser.tpl
+++ b/wcfsetup/install/files/acp/templates/languageChooser.tpl
@@ -19,7 +19,7 @@
 			var languages = {
 				{implode from=$languages item=__language}
 					'{@$__language->languageID}': {
-						iconPath: '{@$__language->getIconPath()}',
+						iconPath: '{@$__language->getIconPath()|encodeJS}',
 						languageName: '{$__language}'
 					}
 				{/implode}
diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabMedia.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabMedia.js
index 6bf08d8529..5c645401e7 100644
--- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabMedia.js
+++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabMedia.js
@@ -6,9 +6,9 @@ $.Redactor.prototype.WoltLabMedia = function() {
 			var button = this.button.add('woltlabMedia', 'Media');
 			$(button).attr('id', 'mediaManagerButton');
 			
-			require(['WoltLab/WCF/Media/Manager'], (function(MediaManager) {
+			require(['WoltLab/WCF/Media/Manager'], function(MediaManager) {
 				new MediaManager();
-			}).bind(this));
+			});
 		},
 	};
 };
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Attachment/Upload.js b/wcfsetup/install/files/js/WoltLab/WCF/Attachment/Upload.js
index fae9ea7923..403545884c 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Attachment/Upload.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Attachment/Upload.js
@@ -1,4 +1,6 @@
-
+/**
+ * TODO: complete implementation
+ */
 define(['Core', 'Dom/ChangeListener', 'Dom/Traverse', 'Language', 'List', 'Upload'], function(Core, DomChangeListener, DomTraverse, Language, List, Upload) {
 	"use strict";
 	
@@ -112,10 +114,10 @@ define(['Core', 'Dom/ChangeListener', 'Dom/Traverse', 'Language', 'List', 'Uploa
 		 */
 		_getParameters: function() {
 			return {
-				objectID: this._objectIdh,
+				objectID: this._objectId,
 				objectType: this._objectType,
 				parentObjectID: this._parentObjectId,
-				tmpHash: this._tmpHas
+				tmpHash: this._tmpHash
 			};
 		},
 		
diff --git a/wcfsetup/install/files/lib/system/upload/DefaultUploadFileSaveStrategy.class.php b/wcfsetup/install/files/lib/system/upload/DefaultUploadFileSaveStrategy.class.php
index af36be427b..3f6472d5bd 100644
--- a/wcfsetup/install/files/lib/system/upload/DefaultUploadFileSaveStrategy.class.php
+++ b/wcfsetup/install/files/lib/system/upload/DefaultUploadFileSaveStrategy.class.php
@@ -124,7 +124,7 @@ class DefaultUploadFileSaveStrategy implements IUploadFileSaveStrategy {
 			FileUtil::makePath($dir, 0777);
 		}
 		
-		// move uploaded filex
+		// move uploaded file
 		if (@move_uploaded_file($uploadFile->getLocation(), $object->getLocation())) {
 			// rotate image based on the exif data
 			if (!empty($this->options['rotateImages'])) {
@@ -165,7 +165,7 @@ class DefaultUploadFileSaveStrategy implements IUploadFileSaveStrategy {
 								
 								$adapter->writeImage($object->getLocation());
 								
-								// update width, height and filesize of the attachment
+								// update width, height and filesize of the object
 								if ($newImage !== null && ($orientation == ExifUtil::ORIENTATION_90_ROTATE || $orientation == ExifUtil::ORIENTATION_270_ROTATE)) {
 									(new $this->editorClassName($object))->update([
 										'height' => $object->width,
-- 
2.20.1