| Index: trunk/extensions/WebFonts/resources/ext.webfonts.css |
| — | — | @@ -14,12 +14,10 @@ |
| 15 | 15 | z-index: 99999; |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | | - |
| 19 | 18 | div#webfonts-menu .menu ul { |
| 20 | 19 | padding-left: 5px!important; |
| 21 | 20 | } |
| 22 | 21 | |
| 23 | | - |
| 24 | 22 | div#webfonts-fonts li { |
| 25 | 23 | margin: 0; |
| 26 | 24 | padding: 5px; |
| Index: trunk/extensions/WebFonts/WebFonts.hooks.php |
| — | — | @@ -11,6 +11,9 @@ |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * BeforePageDisplay hook handler. |
| | 15 | + * @param $out OutputPage |
| | 16 | + * @param $skin Skin |
| | 17 | + * @return bool |
| 15 | 18 | */ |
| 16 | 19 | public static function addModules( $out, $skin ) { |
| 17 | 20 | |
| — | — | @@ -23,6 +26,9 @@ |
| 24 | 27 | |
| 25 | 28 | /** |
| 26 | 29 | * GetPreferences hook handler. |
| | 30 | + * @param $user User |
| | 31 | + * @param $preferences array |
| | 32 | + * @return bool |
| 27 | 33 | */ |
| 28 | 34 | public static function addPreference( $user, &$preferences ) { |
| 29 | 35 | // A checkbox in preferences to enable WebFonts |
| — | — | @@ -35,11 +41,13 @@ |
| 36 | 42 | |
| 37 | 43 | return true; |
| 38 | 44 | } |
| 39 | | - |
| | 45 | + |
| 40 | 46 | /** |
| 41 | 47 | * UserGetDefaultOptions hook handler. |
| | 48 | + * @param $defaultOptions array |
| | 49 | + * @return bool |
| 42 | 50 | */ |
| 43 | | - public static function addDefaultOptions( &$defaultOptions ) { |
| | 51 | + public static function addDefaultOptions( &$defaultOptions ) { |
| 44 | 52 | global $wgWebFontsEnabledByDefault; |
| 45 | 53 | // By default, the preference page option to enable webfonts is set to wgWebFontsEnabledByDefault value. |
| 46 | 54 | $defaultOptions['webfontsEnable'] = $wgWebFontsEnabledByDefault; |
| Index: trunk/extensions/WikimediaMaintenance/dumpInterwiki.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | $this->dblist = array_map( "trim", file( $this->getOption( 'dblist', "/home/wikipedia/common/all.dblist" ) ) ); |
| 58 | 58 | |
| 59 | 59 | # Special-case databases |
| 60 | | - $this->specials = array_flip( array_map( "trim", file( $this->getOption( 'specialdbs', "/home/wikipedia/common/special.dblist" ) ) ) ); |
| | 60 | + $this->specials = array_flip( array_map( "trim", file( $this->getOption( 'specialdbs', "/home/wikipedia/common/special.dblist" ) ) ) ); |
| 61 | 61 | |
| 62 | 62 | if ( $this->hasOption( 'o' ) ) { |
| 63 | 63 | $this->dbFile = CdbWriter::open( $this->getOption( 'o' ) ) ; |
| — | — | @@ -171,7 +171,7 @@ |
| 172 | 172 | # Special wiki |
| 173 | 173 | # Has interwiki links and interlanguage links to wikipedia |
| 174 | 174 | |
| 175 | | - $this->makeLink( array( 'iw_prefix' => $db, 'iw_url' => "wiki" ), "__sites" ); |
| | 175 | + $this->makeLink( array( 'iw_prefix' => $db, 'iw_url' => "wiki", "iw_local" => 1 ), "__sites" ); |
| 176 | 176 | # Links to multilanguage sites |
| 177 | 177 | foreach ( $sites as $targetSite ) { |
| 178 | 178 | $this->makeLink( array( 'iw_prefix' => $targetSite->lateral, |
| — | — | @@ -276,7 +276,6 @@ |
| 277 | 277 | } else { |
| 278 | 278 | $this->output( "{$source}:{$entry['iw_prefix']} {$entry['iw_url']} {$entry['iw_local']}\n" ); |
| 279 | 279 | } |
| 280 | | - |
| 281 | 280 | # Add to list of prefixes |
| 282 | 281 | $this->prefixLists[$source][$entry['iw_prefix']] = 1; |
| 283 | 282 | } |
| Index: trunk/extensions/CentralNotice/CentralNotice.php |
| — | — | @@ -159,7 +159,7 @@ |
| 160 | 160 | |
| 161 | 161 | $wgSpecialPages['CentralNoticeLogs'] = 'SpecialCentralNoticeLogs'; |
| 162 | 162 | $wgAutoloadClasses['SpecialCentralNoticeLogs'] = $specialDir . 'SpecialCentralNoticeLogs.php'; |
| 163 | | - |
| | 163 | + |
| 164 | 164 | $wgAutoloadClasses['TemplatePager'] = $dir . 'TemplatePager.php'; |
| 165 | 165 | $wgAutoloadClasses['CentralNoticePager'] = $dir . 'CentralNoticePager.php'; |
| 166 | 166 | $wgAutoloadClasses['CentralNoticeCampaignLogPager'] = $dir . 'CentralNoticeCampaignLogPager.php'; |
| — | — | @@ -328,7 +328,7 @@ |
| 329 | 329 | // "username" the user's username |
| 330 | 330 | $postData['username'] = $wgUser->getName(); |
| 331 | 331 | |
| 332 | | - // Security checksum. Prevent users from entering the survey with invalid metrics |
| | 332 | + // Security checksum. Prevent users from entering the survey with invalid metrics |
| 333 | 333 | $postData['secretkey'] = md5( $salt . serialize( $hashData ) ); |
| 334 | 334 | |
| 335 | 335 | // MD5 hash |