| Index: trunk/phase3/includes/search/SearchOracle.php |
| — | — | @@ -238,7 +238,6 @@ |
| 239 | 239 | * @param $text String |
| 240 | 240 | */ |
| 241 | 241 | function update($id, $title, $text) { |
| 242 | | - global $wgDBprefix; |
| 243 | 242 | $dbw = wfGetDB(DB_MASTER); |
| 244 | 243 | $dbw->replace('searchindex', |
| 245 | 244 | array('si_page'), |
| Index: trunk/phase3/includes/db/DatabaseOracle.php |
| — | — | @@ -1085,7 +1085,7 @@ |
| 1086 | 1086 | } |
| 1087 | 1087 | |
| 1088 | 1088 | public function removeIdentifierQuotes( $s ) { |
| 1089 | | - return strpos($s, '/*Q*/') === FALSE ? $s : substr($s, 5); ; |
| | 1089 | + return strpos($s, '/*Q*/') === FALSE ? $s : substr($s, 5); |
| 1090 | 1090 | } |
| 1091 | 1091 | |
| 1092 | 1092 | public function isQuotedIdentifier( $s ) { |
| Index: trunk/phase3/includes/actions/CreditsAction.php |
| — | — | @@ -186,7 +186,7 @@ |
| 187 | 187 | * @return String: html |
| 188 | 188 | */ |
| 189 | 189 | protected static function link( User $user ) { |
| 190 | | - global $wgUser, $wgHiddenPrefs; |
| | 190 | + global $wgHiddenPrefs; |
| 191 | 191 | if ( !in_array( 'realname', $wgHiddenPrefs ) && !$user->isAnon() ) { |
| 192 | 192 | $real = $user->getRealName(); |
| 193 | 193 | } else { |
| — | — | @@ -225,7 +225,6 @@ |
| 226 | 226 | * @return String: html |
| 227 | 227 | */ |
| 228 | 228 | protected function othersLink() { |
| 229 | | - global $wgUser; |
| 230 | 229 | return Linker::link( |
| 231 | 230 | $this->getTitle(), |
| 232 | 231 | wfMsgHtml( 'others' ), |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -934,9 +934,6 @@ |
| 935 | 935 | 'section' => 'searchoptions/advancedsearchoptions', |
| 936 | 936 | ); |
| 937 | 937 | |
| 938 | | - // Searchable namespaces back-compat with old format |
| 939 | | - $searchableNamespaces = SearchEngine::searchableNamespaces(); |
| 940 | | - |
| 941 | 938 | $nsOptions = array(); |
| 942 | 939 | |
| 943 | 940 | foreach ( $wgContLang->getNamespaces() as $ns => $name ) { |
| Index: trunk/phase3/includes/Import.php |
| — | — | @@ -202,7 +202,6 @@ |
| 203 | 203 | public function importUpload( $revision ) { |
| 204 | 204 | $dbw = wfGetDB( DB_MASTER ); |
| 205 | 205 | return $dbw->deadlockLoop( array( $revision, 'importUpload' ) ); |
| 206 | | - return false; |
| 207 | 206 | } |
| 208 | 207 | |
| 209 | 208 | /** |