From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 15 Feb 2015 13:47:43 +0000 (+0100)
Subject: Fixed manual logo filename
X-Git-Tag: 2.1.0_RC_1~3^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7d270a91cccf1c4d45b92c0633be547b67e2776d;p=GitHub%2FWoltLab%2FWCF.git

Fixed manual logo filename
---

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.Style.js b/wcfsetup/install/files/acp/js/WCF.ACP.Style.js
index 51b49d25f2..e2a70d3c5e 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.Style.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.Style.js
@@ -231,12 +231,17 @@ WCF.ACP.Style.LogoUpload = WCF.Upload.extend({
 		var $src = this._pageLogo.val();
 		if ($src.length) {
 			if (!$src.match(/^https?:\/\//)) {
-				var $path = this._pageLogo.val();
+				var $path = this._imagePath.val();
 				if (!$path) {
 					$path = 'images/';
 				}
 				
-				$path = this._wcfPath + $path;
+				$path = this._wcfPath + $path.replace(/^\/?images\/?/, '');
+				if ($path.substr(-1) !== '/') {
+					$path += '/';
+				}
+				
+				$src = $path + $src;
 			}
 		}
 		else {