From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Thu, 18 Sep 2014 11:01:33 +0000 (+0200)
Subject: Move default logo to resources/assets/ directory
X-Git-Tag: 1.31.0-rc.0~13906^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=96b3dd0ae373a09120b66c9d23fa58d64c7c7698;p=lhc%2Fweb%2Fwiklou.git

Move default logo to resources/assets/ directory

The problem here is that the path to 'wiki.png' is saved in users'
LocalSettings.

We likely should not remap the path, like we did for footer license
icons in Ic7c32e56:

* It's likely that users changed their logo image by overwriting the
  file in skins/common/.
* If the normal upgrade process is followed (overwrite-uploading new
  files), the old file will still be there with the skins/common/
  directory.
* If it does cause problems, they'll be rather easy to notice and fix.

On the other hand, maybe we should?

* This is going to be annoying for git users.
* It will bite anyone who deletes all MediaWiki files when upgrading
  via tarball, which is more likely with the recent skin system
  changes encouraging users to remove old cruft from skins/ directory.

Bug: 69277
Change-Id: I175fe57048ebf9d348fb2fe67bf62cf5df389003
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9ec47f2cef..b696c84a43 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -253,7 +253,7 @@ $wgFileCacheDirectory = false;
 
 /**
  * The URL path of the wiki logo. The logo size should be 135x135 pixels.
- * Defaults to "{$wgStylePath}/common/images/wiki.png".
+ * Defaults to "$wgResourceBasePath/resources/assets/wiki.png".
  */
 $wgLogo = false;
 
diff --git a/includes/Setup.php b/includes/Setup.php
index 253d25b21d..7a89c7a320 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -82,7 +82,7 @@ if ( $wgResourceBasePath === null ) {
 }
 
 if ( $wgLogo === false ) {
-	$wgLogo = "$wgStylePath/common/images/wiki.png";
+	$wgLogo = "$wgResourceBasePath/resources/assets/wiki.png";
 }
 
 if ( $wgUploadPath === false ) {
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index f84ed0005d..86c36518ac 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -225,7 +225,7 @@ abstract class Installer {
 
 		// $wgLogo is probably wrong (bug 48084); set something that will work.
 		// Single quotes work fine here, as LocalSettingsGenerator outputs this unescaped.
-		'wgLogo' => '$wgStylePath/common/images/wiki.png',
+		'wgLogo' => '$wgScriptPath/resources/assets/wiki.png',
 	);
 
 	/**
diff --git a/resources/assets/wiki.png b/resources/assets/wiki.png
new file mode 100644
index 0000000000..48595b00d8
Binary files /dev/null and b/resources/assets/wiki.png differ
diff --git a/skins/common/images/wiki.png b/skins/common/images/wiki.png
deleted file mode 100644
index 48595b00d8..0000000000
Binary files a/skins/common/images/wiki.png and /dev/null differ