| Index: trunk/phase3/maintenance/storage/moveToExternal.php |
| — | — | @@ -48,8 +48,7 @@ |
| 49 | 49 | print "Moving text rows from $minID to $maxID to external storage\n"; |
| 50 | 50 | $ext = new ExternalStoreDB; |
| 51 | 51 | $numMoved = 0; |
| 52 | | - $numStubs = 0; |
| 53 | | - |
| | 52 | + |
| 54 | 53 | for ( $block = 0; $block < $numBlocks; $block++ ) { |
| 55 | 54 | $blockStart = $block * $blockSize + $minID; |
| 56 | 55 | $blockEnd = $blockStart + $blockSize - 1; |
| Index: trunk/phase3/maintenance/storage/orphanStats.php |
| — | — | @@ -34,7 +34,6 @@ |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function execute() { |
| 38 | | - $extDBs = array(); |
| 39 | 38 | $dbr = wfGetDB( DB_SLAVE ); |
| 40 | 39 | if ( !$dbr->tableExists( 'blob_orphans' ) ) { |
| 41 | 40 | $this->error( "blob_orphans doesn't seem to exist, need to run trackBlobs.php first", true ); |
| Index: trunk/phase3/maintenance/populateSha1.php |
| — | — | @@ -53,8 +53,7 @@ |
| 54 | 54 | } |
| 55 | 55 | $imageTable = $dbw->tableName( 'image' ); |
| 56 | 56 | $oldimageTable = $dbw->tableName( 'oldimage' ); |
| 57 | | - $batch = array(); |
| 58 | | - |
| | 57 | + |
| 59 | 58 | if ( $method == 'pipe' ) { |
| 60 | 59 | // @fixme kill this and replace with a second unbuffered DB connection. |
| 61 | 60 | global $wgDBuser, $wgDBserver, $wgDBpassword, $wgDBname; |
| Index: trunk/phase3/maintenance/tests/ApiTest.php |
| — | — | @@ -13,11 +13,8 @@ |
| 14 | 14 | 'sessionkey' => null, |
| 15 | 15 | ); |
| 16 | 16 | } |
| 17 | | - |
| 18 | | - |
| 19 | 17 | } |
| 20 | 18 | |
| 21 | | - |
| 22 | 19 | class ApiTest extends ApiTestSetup { |
| 23 | 20 | |
| 24 | 21 | function setup() { |
| Index: trunk/phase3/maintenance/populateLogUsertext.php |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | $cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id"; |
| 52 | 52 | $res = $db->select( array( 'logging', 'user' ), |
| 53 | 53 | array( 'log_id', 'user_name' ), $cond, __METHOD__ ); |
| 54 | | - $batch = array(); |
| | 54 | + |
| 55 | 55 | $db->begin(); |
| 56 | 56 | foreach ( $res as $row ) { |
| 57 | 57 | $db->update( 'logging', array( 'log_user_text' => $row->user_name ), |
| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -103,7 +103,6 @@ |
| 104 | 104 | } else { |
| 105 | 105 | $talkId = "{$subjectId}_talk"; |
| 106 | 106 | } |
| 107 | | - $currentId = $isTalk ? $talkId : $subjectId; |
| 108 | 107 | |
| 109 | 108 | // Adds namespace links |
| 110 | 109 | $links['namespaces'][$subjectId] = $this->tabAction( |
| Index: trunk/phase3/includes/ChangeTags.php |
| — | — | @@ -119,7 +119,6 @@ |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | // Figure out which conditions can be done. |
| 123 | | - $join_field = ''; |
| 124 | 123 | if ( in_array( 'recentchanges', $tables ) ) { |
| 125 | 124 | $join_cond = 'rc_id'; |
| 126 | 125 | } elseif( in_array( 'logging', $tables ) ) { |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -367,8 +367,6 @@ |
| 368 | 368 | # 2. minor edits (changes) are only regarded if the global flag indicates so |
| 369 | 369 | |
| 370 | 370 | $isUserTalkPage = ($title->getNamespace() == NS_USER_TALK); |
| 371 | | - $enotifusertalkpage = ($isUserTalkPage && $wgEnotifUserTalk); |
| 372 | | - $enotifwatchlistpage = $wgEnotifWatchlist; |
| 373 | 371 | |
| 374 | 372 | $this->title = $title; |
| 375 | 373 | $this->timestamp = $timestamp; |
| Index: trunk/phase3/includes/media/GIF.php |
| — | — | @@ -61,8 +61,8 @@ |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | function getLongDesc( $image ) { |
| 65 | | - global $wgUser, $wgLang; |
| 66 | | - $sk = $wgUser->getSkin(); |
| | 65 | + global $wgLang; |
| | 66 | + |
| 67 | 67 | $original = parent::getLongDesc( $image ); |
| 68 | 68 | |
| 69 | 69 | wfSuppressWarnings(); |
| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -351,8 +351,6 @@ |
| 352 | 352 | |
| 353 | 353 | $wgOut->addHTML( "<ul>" ); |
| 354 | 354 | |
| 355 | | - $where = $revObjs = array(); |
| 356 | | - |
| 357 | 355 | $numRevisions = 0; |
| 358 | 356 | // Live revisions... |
| 359 | 357 | $list = $this->getList(); |
| Index: trunk/phase3/includes/specials/SpecialTags.php |
| — | — | @@ -27,11 +27,10 @@ |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | function execute( $par ) { |
| 31 | | - global $wgOut, $wgUser, $wgMessageCache; |
| | 31 | + global $wgOut, $wgMessageCache; |
| 32 | 32 | |
| 33 | 33 | $wgMessageCache->loadAllMessages(); |
| 34 | 34 | |
| 35 | | - $sk = $wgUser->getSkin(); |
| 36 | 35 | $wgOut->setPageTitle( wfMsg( 'tags-title' ) ); |
| 37 | 36 | $wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>", 'tags-intro' ); |
| 38 | 37 | |
| Index: trunk/phase3/includes/specials/SpecialMovepage.php |
| — | — | @@ -82,7 +82,7 @@ |
| 83 | 83 | |
| 84 | 84 | function __construct( $oldTitle, $newTitle ) { |
| 85 | 85 | global $wgRequest, $wgUser; |
| 86 | | - $target = isset($par) ? $par : $wgRequest->getVal( 'target' ); |
| | 86 | + |
| 87 | 87 | $this->oldTitle = $oldTitle; |
| 88 | 88 | $this->newTitle = $newTitle; |
| 89 | 89 | $this->reason = $wgRequest->getText( 'wpReason' ); |
| Index: trunk/phase3/includes/RevisionDelete.php |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | $originalKey = $key = $paramArray[0]; |
| 152 | 152 | // $paramArray[1] is a CSV of the IDs |
| 153 | 153 | $Ids = explode( ',', $paramArray[1] ); |
| 154 | | - $query = $paramArray[1]; |
| | 154 | + |
| 155 | 155 | $revert = array(); |
| 156 | 156 | |
| 157 | 157 | // For if undeleted revisions are found amidst deleted ones. |