From 1cf5a6e9d3cc9239ed64f7d12ba5cf47ee1d331c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Wed, 17 Sep 2014 21:39:03 +0200
Subject: [PATCH] Move assets/ to resources/assets/

While it's "semantically" incorrect (these files are not
ResourceLoader resources), putting them in that subdirectory is a lot
less hassle than introducing a new toplevel directory.

Follow-up to 2b4b9a3f. Discussion that resulted in the toplevel
assets/ took place on I6268d663 (now abandoned).

Change-Id: Iedbfd802457fe35803899e3479540177760ec30b
---
 includes/DefaultSettings.php                        |   2 +-
 includes/PHPVersionError.php                        |   2 +-
 includes/Setup.php                                  |   4 ++--
 includes/filerepo/file/File.php                     |   4 ++--
 includes/installer/Installer.php                    |  12 ++++++------
 includes/skins/Skin.php                             |   2 +-
 includes/templates/NoLocalSettings.php              |   2 +-
 .../assets}/file-type-icons/COPYING                 |   0
 .../assets}/file-type-icons/fileicon-c.png          | Bin
 .../assets}/file-type-icons/fileicon-cpp.png        | Bin
 .../assets}/file-type-icons/fileicon-deb.png        | Bin
 .../assets}/file-type-icons/fileicon-djvu.png       | Bin
 .../assets}/file-type-icons/fileicon-djvu.xcf       | Bin
 .../assets}/file-type-icons/fileicon-dvi.png        | Bin
 .../assets}/file-type-icons/fileicon-exe.png        | Bin
 .../assets}/file-type-icons/fileicon-h.png          | Bin
 .../assets}/file-type-icons/fileicon-html.png       | Bin
 .../assets}/file-type-icons/fileicon-iso.png        | Bin
 .../assets}/file-type-icons/fileicon-java.png       | Bin
 .../assets}/file-type-icons/fileicon-mid.png        | Bin
 .../assets}/file-type-icons/fileicon-mov.png        | Bin
 .../assets}/file-type-icons/fileicon-o.png          | Bin
 .../assets}/file-type-icons/fileicon-ogg.png        | Bin
 .../assets}/file-type-icons/fileicon-ogg.xcf        | Bin
 .../assets}/file-type-icons/fileicon-pdf.png        | Bin
 .../assets}/file-type-icons/fileicon-ps.png         | Bin
 .../assets}/file-type-icons/fileicon-psd.png        | Bin
 .../assets}/file-type-icons/fileicon-rm.png         | Bin
 .../assets}/file-type-icons/fileicon-rpm.png        | Bin
 .../assets}/file-type-icons/fileicon-svg.png        | Bin
 .../assets}/file-type-icons/fileicon-tar.png        | Bin
 .../assets}/file-type-icons/fileicon-tex.png        | Bin
 .../assets}/file-type-icons/fileicon-ttf.png        | Bin
 .../assets}/file-type-icons/fileicon-txt.png        | Bin
 .../assets}/file-type-icons/fileicon-xcf.png        | Bin
 .../assets}/file-type-icons/fileicon.png            | Bin
 {assets => resources/assets}/licenses/cc-0.png      | Bin
 .../assets}/licenses/cc-by-nc-sa.png                | Bin
 {assets => resources/assets}/licenses/cc-by-sa.png  | Bin
 {assets => resources/assets}/licenses/cc-by.png     | Bin
 {assets => resources/assets}/licenses/gnu-fdl.png   | Bin
 .../assets}/licenses/public-domain.png              | Bin
 {assets => resources/assets}/mediawiki.png          | Bin
 .../assets}/poweredby_mediawiki_88x31.png           | Bin
 44 files changed, 14 insertions(+), 14 deletions(-)
 rename {assets => resources/assets}/file-type-icons/COPYING (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-c.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-cpp.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-deb.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-djvu.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-djvu.xcf (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-dvi.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-exe.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-h.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-html.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-iso.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-java.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-mid.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-mov.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-o.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-ogg.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-ogg.xcf (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-pdf.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-ps.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-psd.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-rm.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-rpm.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-svg.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-tar.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-tex.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-ttf.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-txt.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon-xcf.png (100%)
 rename {assets => resources/assets}/file-type-icons/fileicon.png (100%)
 rename {assets => resources/assets}/licenses/cc-0.png (100%)
 rename {assets => resources/assets}/licenses/cc-by-nc-sa.png (100%)
 rename {assets => resources/assets}/licenses/cc-by-sa.png (100%)
 rename {assets => resources/assets}/licenses/cc-by.png (100%)
 rename {assets => resources/assets}/licenses/gnu-fdl.png (100%)
 rename {assets => resources/assets}/licenses/public-domain.png (100%)
 rename {assets => resources/assets}/mediawiki.png (100%)
 rename {assets => resources/assets}/poweredby_mediawiki_88x31.png (100%)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8b29733706..51606847a2 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3102,7 +3102,7 @@ $wgFooterIcons = array(
 	),
 	"poweredby" => array(
 		"mediawiki" => array(
-			"src" => null, // Defaults to "$wgScriptPath/assets/poweredby_mediawiki_88x31.png"
+			"src" => null, // Defaults to "$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png"
 			"url" => "//www.mediawiki.org/",
 			"alt" => "Powered by MediaWiki",
 		)
diff --git a/includes/PHPVersionError.php b/includes/PHPVersionError.php
index 44038a5895..f481650c0b 100644
--- a/includes/PHPVersionError.php
+++ b/includes/PHPVersionError.php
@@ -60,7 +60,7 @@ function wfPHPVersionError( $type ) {
 		}
 		$encLogo = htmlspecialchars(
 			str_replace( '//', '/', $dirname . '/' ) .
-			'assets/mediawiki.png'
+			'resources/assets/mediawiki.png'
 		);
 
 		header( "$protocol 500 MediaWiki configuration Error" );
diff --git a/includes/Setup.php b/includes/Setup.php
index 78a41d5d98..cf2df6bd6b 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -106,7 +106,7 @@ if ( $wgGitInfoCacheDirectory === false && $wgCacheDirectory !== false ) {
 if ( $wgRightsIcon ) {
 	$wgRightsIcon = str_replace(
 		"{$wgStylePath}/common/images/",
-		"{$wgScriptPath}/assets/licenses/",
+		"{$wgScriptPath}/resources/assets/licenses/",
 		$wgRightsIcon
 	);
 }
@@ -133,7 +133,7 @@ if ( isset( $wgFooterIcons['poweredby'] )
 	&& $wgFooterIcons['poweredby']['mediawiki']['src'] === null
 ) {
 	$wgFooterIcons['poweredby']['mediawiki']['src'] =
-		"$wgScriptPath/assets/poweredby_mediawiki_88x31.png";
+		"$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png";
 }
 
 /**
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 11a3e5c035..08c98bd060 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1329,8 +1329,8 @@ abstract class File {
 	 */
 	function iconThumb() {
 		global $wgScriptPath, $IP;
-		$assetsPath = "$wgScriptPath/assets/file-type-icons/";
-		$assetsDirectory = "$IP/assets/file-type-icons/";
+		$assetsPath = "$wgScriptPath/resources/assets/file-type-icons/";
+		$assetsDirectory = "$IP/resources/assets/file-type-icons/";
 
 		$try = array( 'fileicon-' . $this->getExtension() . '.png', 'fileicon.png' );
 		foreach ( $try as $icon ) {
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 544efb6243..7d94c2c711 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -286,27 +286,27 @@ abstract class Installer {
 	public $licenses = array(
 		'cc-by' => array(
 			'url' => 'http://creativecommons.org/licenses/by/3.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-by.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-by.png',
 		),
 		'cc-by-sa' => array(
 			'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-by-sa.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-by-sa.png',
 		),
 		'cc-by-nc-sa' => array(
 			'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-by-nc-sa.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-by-nc-sa.png',
 		),
 		'cc-0' => array(
 			'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
-			'icon' => '{$wgScriptPath}/assets/licenses/cc-0.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/cc-0.png',
 		),
 		'pd' => array(
 			'url' => '',
-			'icon' => '{$wgScriptPath}/assets/licenses/public-domain.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/public-domain.png',
 		),
 		'gfdl' => array(
 			'url' => 'http://www.gnu.org/copyleft/fdl.html',
-			'icon' => '{$wgScriptPath}/assets/licenses/gnu-fdl.png',
+			'icon' => '{$wgScriptPath}/resources/assets/licenses/gnu-fdl.png',
 		),
 		'none' => array(
 			'url' => '',
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 7cabf503c0..7793f1da15 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -829,7 +829,7 @@ abstract class Skin extends ContextSource {
 	function getPoweredBy() {
 		global $wgScriptPath;
 
-		$url = htmlspecialchars( "$wgScriptPath/assets/poweredby_mediawiki_88x31.png" );
+		$url = htmlspecialchars( "$wgScriptPath/resources/assets/poweredby_mediawiki_88x31.png" );
 		$text = '<a href="//www.mediawiki.org/"><img src="' . $url
 			. '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
 		wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );
diff --git a/includes/templates/NoLocalSettings.php b/includes/templates/NoLocalSettings.php
index 0f9a6ba36f..5b88dfd1fa 100644
--- a/includes/templates/NoLocalSettings.php
+++ b/includes/templates/NoLocalSettings.php
@@ -72,7 +72,7 @@ if ( !function_exists( 'session_name' ) ) {
 		</style>
 	</head>
 	<body>
-		<img src="<?php echo htmlspecialchars( $path ) ?>assets/mediawiki.png" alt='The MediaWiki logo' />
+		<img src="<?php echo htmlspecialchars( $path ) ?>resources/assets/mediawiki.png" alt='The MediaWiki logo' />
 
 		<h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ) ?></h1>
 		<div class='error'>
diff --git a/assets/file-type-icons/COPYING b/resources/assets/file-type-icons/COPYING
similarity index 100%
rename from assets/file-type-icons/COPYING
rename to resources/assets/file-type-icons/COPYING
diff --git a/assets/file-type-icons/fileicon-c.png b/resources/assets/file-type-icons/fileicon-c.png
similarity index 100%
rename from assets/file-type-icons/fileicon-c.png
rename to resources/assets/file-type-icons/fileicon-c.png
diff --git a/assets/file-type-icons/fileicon-cpp.png b/resources/assets/file-type-icons/fileicon-cpp.png
similarity index 100%
rename from assets/file-type-icons/fileicon-cpp.png
rename to resources/assets/file-type-icons/fileicon-cpp.png
diff --git a/assets/file-type-icons/fileicon-deb.png b/resources/assets/file-type-icons/fileicon-deb.png
similarity index 100%
rename from assets/file-type-icons/fileicon-deb.png
rename to resources/assets/file-type-icons/fileicon-deb.png
diff --git a/assets/file-type-icons/fileicon-djvu.png b/resources/assets/file-type-icons/fileicon-djvu.png
similarity index 100%
rename from assets/file-type-icons/fileicon-djvu.png
rename to resources/assets/file-type-icons/fileicon-djvu.png
diff --git a/assets/file-type-icons/fileicon-djvu.xcf b/resources/assets/file-type-icons/fileicon-djvu.xcf
similarity index 100%
rename from assets/file-type-icons/fileicon-djvu.xcf
rename to resources/assets/file-type-icons/fileicon-djvu.xcf
diff --git a/assets/file-type-icons/fileicon-dvi.png b/resources/assets/file-type-icons/fileicon-dvi.png
similarity index 100%
rename from assets/file-type-icons/fileicon-dvi.png
rename to resources/assets/file-type-icons/fileicon-dvi.png
diff --git a/assets/file-type-icons/fileicon-exe.png b/resources/assets/file-type-icons/fileicon-exe.png
similarity index 100%
rename from assets/file-type-icons/fileicon-exe.png
rename to resources/assets/file-type-icons/fileicon-exe.png
diff --git a/assets/file-type-icons/fileicon-h.png b/resources/assets/file-type-icons/fileicon-h.png
similarity index 100%
rename from assets/file-type-icons/fileicon-h.png
rename to resources/assets/file-type-icons/fileicon-h.png
diff --git a/assets/file-type-icons/fileicon-html.png b/resources/assets/file-type-icons/fileicon-html.png
similarity index 100%
rename from assets/file-type-icons/fileicon-html.png
rename to resources/assets/file-type-icons/fileicon-html.png
diff --git a/assets/file-type-icons/fileicon-iso.png b/resources/assets/file-type-icons/fileicon-iso.png
similarity index 100%
rename from assets/file-type-icons/fileicon-iso.png
rename to resources/assets/file-type-icons/fileicon-iso.png
diff --git a/assets/file-type-icons/fileicon-java.png b/resources/assets/file-type-icons/fileicon-java.png
similarity index 100%
rename from assets/file-type-icons/fileicon-java.png
rename to resources/assets/file-type-icons/fileicon-java.png
diff --git a/assets/file-type-icons/fileicon-mid.png b/resources/assets/file-type-icons/fileicon-mid.png
similarity index 100%
rename from assets/file-type-icons/fileicon-mid.png
rename to resources/assets/file-type-icons/fileicon-mid.png
diff --git a/assets/file-type-icons/fileicon-mov.png b/resources/assets/file-type-icons/fileicon-mov.png
similarity index 100%
rename from assets/file-type-icons/fileicon-mov.png
rename to resources/assets/file-type-icons/fileicon-mov.png
diff --git a/assets/file-type-icons/fileicon-o.png b/resources/assets/file-type-icons/fileicon-o.png
similarity index 100%
rename from assets/file-type-icons/fileicon-o.png
rename to resources/assets/file-type-icons/fileicon-o.png
diff --git a/assets/file-type-icons/fileicon-ogg.png b/resources/assets/file-type-icons/fileicon-ogg.png
similarity index 100%
rename from assets/file-type-icons/fileicon-ogg.png
rename to resources/assets/file-type-icons/fileicon-ogg.png
diff --git a/assets/file-type-icons/fileicon-ogg.xcf b/resources/assets/file-type-icons/fileicon-ogg.xcf
similarity index 100%
rename from assets/file-type-icons/fileicon-ogg.xcf
rename to resources/assets/file-type-icons/fileicon-ogg.xcf
diff --git a/assets/file-type-icons/fileicon-pdf.png b/resources/assets/file-type-icons/fileicon-pdf.png
similarity index 100%
rename from assets/file-type-icons/fileicon-pdf.png
rename to resources/assets/file-type-icons/fileicon-pdf.png
diff --git a/assets/file-type-icons/fileicon-ps.png b/resources/assets/file-type-icons/fileicon-ps.png
similarity index 100%
rename from assets/file-type-icons/fileicon-ps.png
rename to resources/assets/file-type-icons/fileicon-ps.png
diff --git a/assets/file-type-icons/fileicon-psd.png b/resources/assets/file-type-icons/fileicon-psd.png
similarity index 100%
rename from assets/file-type-icons/fileicon-psd.png
rename to resources/assets/file-type-icons/fileicon-psd.png
diff --git a/assets/file-type-icons/fileicon-rm.png b/resources/assets/file-type-icons/fileicon-rm.png
similarity index 100%
rename from assets/file-type-icons/fileicon-rm.png
rename to resources/assets/file-type-icons/fileicon-rm.png
diff --git a/assets/file-type-icons/fileicon-rpm.png b/resources/assets/file-type-icons/fileicon-rpm.png
similarity index 100%
rename from assets/file-type-icons/fileicon-rpm.png
rename to resources/assets/file-type-icons/fileicon-rpm.png
diff --git a/assets/file-type-icons/fileicon-svg.png b/resources/assets/file-type-icons/fileicon-svg.png
similarity index 100%
rename from assets/file-type-icons/fileicon-svg.png
rename to resources/assets/file-type-icons/fileicon-svg.png
diff --git a/assets/file-type-icons/fileicon-tar.png b/resources/assets/file-type-icons/fileicon-tar.png
similarity index 100%
rename from assets/file-type-icons/fileicon-tar.png
rename to resources/assets/file-type-icons/fileicon-tar.png
diff --git a/assets/file-type-icons/fileicon-tex.png b/resources/assets/file-type-icons/fileicon-tex.png
similarity index 100%
rename from assets/file-type-icons/fileicon-tex.png
rename to resources/assets/file-type-icons/fileicon-tex.png
diff --git a/assets/file-type-icons/fileicon-ttf.png b/resources/assets/file-type-icons/fileicon-ttf.png
similarity index 100%
rename from assets/file-type-icons/fileicon-ttf.png
rename to resources/assets/file-type-icons/fileicon-ttf.png
diff --git a/assets/file-type-icons/fileicon-txt.png b/resources/assets/file-type-icons/fileicon-txt.png
similarity index 100%
rename from assets/file-type-icons/fileicon-txt.png
rename to resources/assets/file-type-icons/fileicon-txt.png
diff --git a/assets/file-type-icons/fileicon-xcf.png b/resources/assets/file-type-icons/fileicon-xcf.png
similarity index 100%
rename from assets/file-type-icons/fileicon-xcf.png
rename to resources/assets/file-type-icons/fileicon-xcf.png
diff --git a/assets/file-type-icons/fileicon.png b/resources/assets/file-type-icons/fileicon.png
similarity index 100%
rename from assets/file-type-icons/fileicon.png
rename to resources/assets/file-type-icons/fileicon.png
diff --git a/assets/licenses/cc-0.png b/resources/assets/licenses/cc-0.png
similarity index 100%
rename from assets/licenses/cc-0.png
rename to resources/assets/licenses/cc-0.png
diff --git a/assets/licenses/cc-by-nc-sa.png b/resources/assets/licenses/cc-by-nc-sa.png
similarity index 100%
rename from assets/licenses/cc-by-nc-sa.png
rename to resources/assets/licenses/cc-by-nc-sa.png
diff --git a/assets/licenses/cc-by-sa.png b/resources/assets/licenses/cc-by-sa.png
similarity index 100%
rename from assets/licenses/cc-by-sa.png
rename to resources/assets/licenses/cc-by-sa.png
diff --git a/assets/licenses/cc-by.png b/resources/assets/licenses/cc-by.png
similarity index 100%
rename from assets/licenses/cc-by.png
rename to resources/assets/licenses/cc-by.png
diff --git a/assets/licenses/gnu-fdl.png b/resources/assets/licenses/gnu-fdl.png
similarity index 100%
rename from assets/licenses/gnu-fdl.png
rename to resources/assets/licenses/gnu-fdl.png
diff --git a/assets/licenses/public-domain.png b/resources/assets/licenses/public-domain.png
similarity index 100%
rename from assets/licenses/public-domain.png
rename to resources/assets/licenses/public-domain.png
diff --git a/assets/mediawiki.png b/resources/assets/mediawiki.png
similarity index 100%
rename from assets/mediawiki.png
rename to resources/assets/mediawiki.png
diff --git a/assets/poweredby_mediawiki_88x31.png b/resources/assets/poweredby_mediawiki_88x31.png
similarity index 100%
rename from assets/poweredby_mediawiki_88x31.png
rename to resources/assets/poweredby_mediawiki_88x31.png
-- 
2.20.1