| Index: trunk/phase3/maintenance/tests/UploadFromUrlTest.php |
| — | — | @@ -216,7 +216,7 @@ |
| 217 | 217 | if ( $t->exists() ) { |
| 218 | 218 | $file = wfFindFile( $name, array( 'ignoreRedirect' => true ) ); |
| 219 | 219 | $empty = ""; |
| 220 | | - $status = FileDeleteForm::doDelete( $t, $file, $empty, "none", true ); |
| | 220 | + FileDeleteForm::doDelete( $t, $file, $empty, "none", true ); |
| 221 | 221 | $a = new Article ( $t ); |
| 222 | 222 | $a->doDeleteArticle( "testing" ); |
| 223 | 223 | } |
| Index: trunk/phase3/maintenance/updaters.inc |
| — | — | @@ -1212,7 +1212,6 @@ |
| 1213 | 1213 | global $wgDatabase, $wgDBmwschema, $wgDBts2schema, $wgDBuser; |
| 1214 | 1214 | |
| 1215 | 1215 | # # Gather version numbers in case we need them |
| 1216 | | - $version = $wgDatabase->getServerVersion(); # # long string |
| 1217 | 1216 | $numver = $wgDatabase->numeric_version; # # X.Y e.g. 8.3 |
| 1218 | 1217 | |
| 1219 | 1218 | # Just in case their LocalSettings.php does not have this: |
| Index: trunk/phase3/includes/parser/Parser_LinkHooks.php |
| — | — | @@ -135,13 +135,7 @@ |
| 136 | 136 | wfProfileOut( __METHOD__.'-setup' ); |
| 137 | 137 | throw new MWException( __METHOD__.": \$this->mTitle is null\n" ); |
| 138 | 138 | } |
| 139 | | - $nottalk = !$this->mTitle->isTalkPage(); |
| 140 | | - |
| 141 | | - if($wgContLang->hasVariants()) { |
| 142 | | - $selflink = $wgContLang->convertLinkToAllVariants($this->mTitle->getPrefixedText()); |
| 143 | | - } else { |
| 144 | | - $selflink = array($this->mTitle->getPrefixedText()); |
| 145 | | - } |
| | 139 | + |
| 146 | 140 | wfProfileOut( __METHOD__.'-setup' ); |
| 147 | 141 | |
| 148 | 142 | $offset = 0; |
| Index: trunk/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -1076,10 +1076,8 @@ |
| 1077 | 1077 | // assume success |
| 1078 | 1078 | $res = true; |
| 1079 | 1079 | // If we are not in a transaction, we need to be for savepoint trickery |
| 1080 | | - $didbegin = 0; |
| 1081 | 1080 | if (! $this->mTrxLevel) { |
| 1082 | 1081 | $this->begin(); |
| 1083 | | - $didbegin = 1; |
| 1084 | 1082 | } |
| 1085 | 1083 | |
| 1086 | 1084 | $sql = "INSERT INTO $table (" . implode( ',', $keys ) . ') VALUES '; |
| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -80,7 +80,6 @@ |
| 81 | 81 | */ |
| 82 | 82 | public $showSessionWarning = false; |
| 83 | 83 | |
| 84 | | - public $helpId = 0; |
| 85 | 84 | public $tabIndex = 1; |
| 86 | 85 | |
| 87 | 86 | public $currentPageName; |
| — | — | @@ -607,7 +606,6 @@ |
| 608 | 607 | $args = func_get_args(); |
| 609 | 608 | array_shift( $args ); |
| 610 | 609 | $args = array_map( 'htmlspecialchars', $args ); |
| 611 | | - |
| 612 | 610 | $text = wfMsgReal( $msg, $args, false, false, false ); |
| 613 | 611 | $html = $this->parse( $text, true ); |
| 614 | 612 | |
| Index: trunk/phase3/includes/FileDeleteForm.php |
| — | — | @@ -253,7 +253,6 @@ |
| 254 | 254 | private function prepareMessage( $message ) { |
| 255 | 255 | global $wgLang; |
| 256 | 256 | if( $this->oldimage ) { |
| 257 | | - $url = $this->file->getArchiveUrl( $this->oldimage ); |
| 258 | 257 | return wfMsgExt( |
| 259 | 258 | "{$message}-old", # To ensure grep will find them: 'filedelete-intro-old', 'filedelete-nofile-old', 'filedelete-success-old' |
| 260 | 259 | 'parse', |
| Index: trunk/phase3/includes/QueryPage.php |
| — | — | @@ -228,8 +228,6 @@ |
| 229 | 229 | return false; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | | - $querycache = $dbr->tableName( 'querycache' ); |
| 233 | | - |
| 234 | 232 | if ( $ignoreErrors ) { |
| 235 | 233 | $ignoreW = $dbw->ignoreErrors( true ); |
| 236 | 234 | $ignoreR = $dbr->ignoreErrors( true ); |