poweredby_mediawiki_88x31.png is straightforward, just need to update
some paths.
The six license icons are more problematic, as the paths to them are saved
in users' LocalSettings. We're remapping them in Setup.php.
Bug: 69277
Change-Id: Ic7c32e56043cfbf94ef2271de4ff41ef18fbeee7
18 files changed:
),
"poweredby" => array(
"mediawiki" => array(
),
"poweredby" => array(
"mediawiki" => array(
- "src" => null, // Defaults to "$wgStylePath/common/images/poweredby_mediawiki_88x31.png"
+ "src" => null, // Defaults to "$wgScriptPath/assets/poweredby_mediawiki_88x31.png"
"url" => "//www.mediawiki.org/",
"alt" => "Powered by MediaWiki",
)
"url" => "//www.mediawiki.org/",
"alt" => "Powered by MediaWiki",
)
$wgGitInfoCacheDirectory = "{$wgCacheDirectory}/gitinfo";
}
$wgGitInfoCacheDirectory = "{$wgCacheDirectory}/gitinfo";
}
+// Fix path to icon images after they were moved in 1.24
+if ( $wgRightsIcon ) {
+ $wgRightsIcon = str_replace(
+ "{$wgStylePath}/common/images/",
+ "{$wgScriptPath}/assets/licenses/",
+ $wgRightsIcon
+ );
+}
+
if ( isset( $wgFooterIcons['copyright'] )
&& isset( $wgFooterIcons['copyright']['copyright'] )
&& $wgFooterIcons['copyright']['copyright'] === array()
if ( isset( $wgFooterIcons['copyright'] )
&& isset( $wgFooterIcons['copyright']['copyright'] )
&& $wgFooterIcons['copyright']['copyright'] === array()
&& $wgFooterIcons['poweredby']['mediawiki']['src'] === null
) {
$wgFooterIcons['poweredby']['mediawiki']['src'] =
&& $wgFooterIcons['poweredby']['mediawiki']['src'] === null
) {
$wgFooterIcons['poweredby']['mediawiki']['src'] =
- "$wgStylePath/common/images/poweredby_mediawiki_88x31.png";
+ "$wgScriptPath/assets/poweredby_mediawiki_88x31.png";
public $licenses = array(
'cc-by' => array(
'url' => 'http://creativecommons.org/licenses/by/3.0/',
public $licenses = array(
'cc-by' => array(
'url' => 'http://creativecommons.org/licenses/by/3.0/',
- 'icon' => '{$wgStylePath}/common/images/cc-by.png',
+ 'icon' => '{$wgScriptPath}/assets/licenses/cc-by.png',
),
'cc-by-sa' => array(
'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
),
'cc-by-sa' => array(
'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
- 'icon' => '{$wgStylePath}/common/images/cc-by-sa.png',
+ 'icon' => '{$wgScriptPath}/assets/licenses/cc-by-sa.png',
),
'cc-by-nc-sa' => array(
'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
),
'cc-by-nc-sa' => array(
'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
- 'icon' => '{$wgStylePath}/common/images/cc-by-nc-sa.png',
+ 'icon' => '{$wgScriptPath}/assets/licenses/cc-by-nc-sa.png',
),
'cc-0' => array(
'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
),
'cc-0' => array(
'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
- 'icon' => '{$wgStylePath}/common/images/cc-0.png',
+ 'icon' => '{$wgScriptPath}/assets/licenses/cc-0.png',
),
'pd' => array(
'url' => '',
),
'pd' => array(
'url' => '',
- 'icon' => '{$wgStylePath}/common/images/public-domain.png',
+ 'icon' => '{$wgScriptPath}/assets/licenses/public-domain.png',
),
'gfdl' => array(
'url' => 'http://www.gnu.org/copyleft/fdl.html',
),
'gfdl' => array(
'url' => 'http://www.gnu.org/copyleft/fdl.html',
- 'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
+ 'icon' => '{$wgScriptPath}/assets/licenses/gnu-fdl.png',
),
'none' => array(
'url' => '',
),
'none' => array(
'url' => '',
* @return string
*/
function getPoweredBy() {
* @return string
*/
function getPoweredBy() {
- $url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
+ $url = htmlspecialchars( "$wgScriptPath/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 ) );
$text = '<a href="//www.mediawiki.org/"><img src="' . $url
. '" height="31" width="88" alt="Powered by MediaWiki" /></a>';
wfRunHooks( 'SkinGetPoweredBy', array( &$text, $this ) );