| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -1094,12 +1094,16 @@ |
| 1095 | 1095 | if( $utf8 ) { |
| 1096 | 1096 | $useNormalizer = 'utf8'; |
| 1097 | 1097 | $utf8 = utf8_normalize( $not_normal_c, UtfNormal::UNORM_NFC ); |
| 1098 | | - if ( $utf8 !== $normal_c ) $needsUpdate = true; |
| | 1098 | + if ( $utf8 !== $normal_c ) { |
| | 1099 | + $needsUpdate = true; |
| | 1100 | + } |
| 1099 | 1101 | } |
| 1100 | 1102 | if( $intl ) { |
| 1101 | 1103 | $useNormalizer = 'intl'; |
| 1102 | 1104 | $intl = normalizer_normalize( $not_normal_c, Normalizer::FORM_C ); |
| 1103 | | - if ( $intl !== $normal_c ) $needsUpdate = true; |
| | 1105 | + if ( $intl !== $normal_c ) { |
| | 1106 | + $needsUpdate = true; |
| | 1107 | + } |
| 1104 | 1108 | } |
| 1105 | 1109 | |
| 1106 | 1110 | // Uses messages 'config-unicode-using-php', 'config-unicode-using-utf8', 'config-unicode-using-intl' |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -220,6 +220,7 @@ |
| 221 | 221 | } |
| 222 | 222 | $nt = $userObj->getUserPage(); |
| 223 | 223 | $talk = $userObj->getTalkPage(); |
| | 224 | + $links = ''; |
| 224 | 225 | if ( $talk ) { |
| 225 | 226 | $tools = $this->getUserLinks( $nt, $talk, $userObj ); |
| 226 | 227 | $links = $this->getLanguage()->pipeList( $tools ); |
| — | — | @@ -545,6 +546,11 @@ |
| 546 | 547 | var $namespace = '', $mDb; |
| 547 | 548 | var $preventClickjacking = false; |
| 548 | 549 | |
| | 550 | + /** |
| | 551 | + * @var array |
| | 552 | + */ |
| | 553 | + protected $mParentLens; |
| | 554 | + |
| 549 | 555 | function __construct( IContextSource $context, array $options ) { |
| 550 | 556 | parent::__construct( $context ); |
| 551 | 557 | |
| — | — | @@ -709,6 +715,7 @@ |
| 710 | 716 | |
| 711 | 717 | /** |
| 712 | 718 | * Do a batched query to get the parent revision lengths |
| | 719 | + * @param $revIds array |
| 713 | 720 | * @return array |
| 714 | 721 | */ |
| 715 | 722 | private function getParentLengths( array $revIds ) { |
| — | — | @@ -751,6 +758,7 @@ |
| 752 | 759 | * was not written by the target user. |
| 753 | 760 | * |
| 754 | 761 | * @todo This would probably look a lot nicer in a table. |
| | 762 | + * @param $row |
| 755 | 763 | * @return string |
| 756 | 764 | */ |
| 757 | 765 | function formatRow( $row ) { |
| — | — | @@ -902,6 +910,9 @@ |
| 903 | 911 | $this->preventClickjacking = true; |
| 904 | 912 | } |
| 905 | 913 | |
| | 914 | + /** |
| | 915 | + * @return bool |
| | 916 | + */ |
| 906 | 917 | public function getPreventClickjacking() { |
| 907 | 918 | return $this->preventClickjacking; |
| 908 | 919 | } |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -725,7 +725,7 @@ |
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | preg_match( "/ref: (.*)/", |
| 729 | | - file_get_contents( $HEADfile), $m ); |
| | 729 | + file_get_contents( $HEADfile ), $m ); |
| 730 | 730 | |
| 731 | 731 | $REFfile = "{$BASEDIR}{$m[1]}"; |
| 732 | 732 | if( !file_exists( $REFfile ) ) { |
| Index: trunk/extensions/CentralNotice/CentralNotice.php |
| — | — | @@ -119,10 +119,10 @@ |
| 120 | 120 | global $wgCentralNoticeLoader, $wgSpecialPageGroups; |
| 121 | 121 | |
| 122 | 122 | $dir = dirname( __FILE__ ) . '/'; |
| 123 | | - |
| | 123 | + |
| 124 | 124 | // Update the database schema if necessary |
| 125 | 125 | $wgHooks['LoadExtensionSchemaUpdates'][] = 'efCentralNoticeSchema'; |
| 126 | | - |
| | 126 | + |
| 127 | 127 | // If CentralNotice banners should be shown on this wiki, load the components we need for |
| 128 | 128 | // showing banners. For discussion of banner loading strategies, see |
| 129 | 129 | // http://wikitech.wikimedia.org/view/CentralNotice/Optimizing_banner_loading |
| Index: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php |
| — | — | @@ -9,6 +9,7 @@ |
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * List of languages available to GeSHi |
| | 13 | + * @var array |
| 13 | 14 | */ |
| 14 | 15 | private static $languages = null; |
| 15 | 16 | |
| — | — | @@ -287,7 +288,6 @@ |
| 288 | 289 | * @return string |
| 289 | 290 | */ |
| 290 | 291 | public static function buildHeadItem( $geshi ) { |
| 291 | | - global $wgUseSiteCss, $wgSquidMaxage; |
| 292 | 292 | $lang = $geshi->language; |
| 293 | 293 | $css = array(); |
| 294 | 294 | $css[] = '<style type="text/css">/*<![CDATA[*/'; |