Merge "Move footer icons to assets/ directory"

diff --combined includes/Setup.php
index 8b2138b,0ccbaed..78a41d5
--- 1/includes/Setup.php
--- 2/includes/Setup.php
+++ b/includes/Setup.php
@@@ -102,6 -102,15 +102,15 @@@ if ( $wgGitInfoCacheDirectory === fals
        $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()
@@@ -124,7 -133,7 +133,7 @@@ if ( isset( $wgFooterIcons['poweredby'
        && $wgFooterIcons['poweredby']['mediawiki']['src'] === null
  ) {
        $wgFooterIcons['poweredby']['mediawiki']['src'] =
-               "$wgStylePath/common/images/poweredby_mediawiki_88x31.png";
+               "$wgScriptPath/assets/poweredby_mediawiki_88x31.png";
  }
  
  /**
@@@ -302,33 -311,7 +311,33 @@@ if ( !$wgCookiePrefix ) 
  }
  $wgCookiePrefix = strtr( $wgCookiePrefix, '=,; +."\'\\[', '__________' );
  
 -$wgUseEnotif = $wgEnotifUserTalk || $wgEnotifWatchlist;
 +if ( $wgEnableEmail ) {
 +      $wgUseEnotif = $wgEnotifUserTalk || $wgEnotifWatchlist;
 +} else {
 +      // Disable all other email settings automatically if $wgEnableEmail
 +      // is set to false. - bug 63678
 +      $wgAllowHTMLEmail = false;
 +      $wgEmailAuthentication = false; // do not require auth if you're not sending email anyway
 +      $wgEnableUserEmail = false;
 +      $wgEnotifFromEditor = false;
 +      $wgEnotifImpersonal = false;
 +      $wgEnotifMaxRecips = 0;
 +      $wgEnotifMinorEdits = false;
 +      $wgEnotifRevealEditorAddress = false;
 +      $wgEnotifUseJobQ = false;
 +      $wgEnotifUseRealName = false;
 +      $wgEnotifUserTalk = false;
 +      $wgEnotifWatchlist = false;
 +      unset( $wgGroupPermissions['user']['sendemail'] );
 +      $wgUseEnotif = false;
 +      $wgUserEmailUseReplyTo = false;
 +      $wgUsersNotifiedOnAllChanges = array();
 +}
 +
 +// Doesn't make sense to have if disabled.
 +if ( !$wgEnotifMinorEdits ) {
 +      $wgHiddenPrefs[] = 'enotifminoredits';
 +}
  
  if ( $wgMetaNamespace === false ) {
        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
@@@ -381,6 -364,11 +390,6 @@@ if ( $wgUseFileCache || $wgUseSquid ) 
        $wgDebugToolbar = false;
  }
  
 -// Doesn't make sense to have if disabled.
 -if ( !$wgEnotifMinorEdits ) {
 -      $wgHiddenPrefs[] = 'enotifminoredits';
 -}
 -
  // We always output HTML5 since 1.22, overriding these is no longer supported
  // we set them here for extensions that depend on its value.
  $wgHtml5 = true;
@@@ -622,6 -610,26 +631,6 @@@ $wgTitle = null
   */
  $wgDeferredUpdateList = array();
  
 -// Disable all other email settings automatically if $wgEnableEmail
 -// is set to false. - bug 63678
 -if ( !$wgEnableEmail ) {
 -      $wgAllowHTMLEmail = false;
 -      $wgEmailAuthentication = false; // do not require auth if you're not sending email anyway
 -      $wgEnableUserEmail = false;
 -      $wgEnotifFromEditor = false;
 -      $wgEnotifImpersonal = false;
 -      $wgEnotifMaxRecips = 0;
 -      $wgEnotifMinorEdits = false;
 -      $wgEnotifRevealEditorAddress = false;
 -      $wgEnotifUseJobQ = false;
 -      $wgEnotifUseRealName = false;
 -      $wgEnotifUserTalk = false;
 -      $wgEnotifWatchlist = false;
 -      unset( $wgGroupPermissions['user']['sendemail'] );
 -      $wgUserEmailUseReplyTo = false;
 -      $wgUsersNotifiedOnAllChanges = array();
 -}
 -
  wfProfileOut( $fname . '-globals' );
  wfProfileIn( $fname . '-extensions' );
  

diff --combined includes/skins/Skin.php
index d68823d,b4f3583..7cabf50
--- 1/includes/skins/Skin.php
--- 2/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@@ -827,9 -827,9 +827,9 @@@ abstract class Skin extends ContextSour
         * @return string
         */
        function getPoweredBy() {
-               global $wgStylePath;
+               global $wgScriptPath;
  
-               $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 ) );
@@@ -1008,18 -1008,15 +1008,18 @@@
        }
  
        /**
 -       * Return a fully resolved style path url to images or styles stored in the common folder.
 -       * This method returns a url resolved using the configured skin style path
 -       * and includes the style version inside of the url.
 +       * This function previously returned a fully resolved style path URL to images or styles stored in
 +       * the legacy skins/common/ directory.
 +       *
 +       * That directory has been removed in 1.24 and the function always returns an empty string.
 +       *
 +       * @deprecated since 1.24
         * @param string $name The name or path of a skin resource file
 -       * @return string The fully resolved style path url including styleversion
 +       * @return string Empty string
         */
        function getCommonStylePath( $name ) {
 -              global $wgStylePath, $wgStyleVersion;
 -              return "$wgStylePath/common/$name?$wgStyleVersion";
 +              wfDeprecated( __METHOD__, '1.24' );
 +              return '';
        }
  
        /**