| Index: trunk/phase3/maintenance/storage/storageTypeStats.php |
| — | — | @@ -12,7 +12,6 @@ |
| 13 | 13 | exit( 1 ); |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | | - $rangeStart = 0; |
| 17 | 16 | $binSize = intval( pow( 10, floor( log10( $endId ) ) - 3 ) ); |
| 18 | 17 | if ( $binSize < 100 ) { |
| 19 | 18 | $binSize = 100; |
| Index: trunk/phase3/maintenance/reassignEdits.php |
| — | — | @@ -47,8 +47,9 @@ |
| 48 | 48 | $report = $this->hasOption( 'report' ); |
| 49 | 49 | $count = $this->doReassignEdits( $from, $to, !$this->hasOption( 'norc' ), $report ); |
| 50 | 50 | # If reporting, and there were items, advise the user to run without --report |
| 51 | | - if ( $report ) |
| | 51 | + if ( $report ) { |
| 52 | 52 | $this->output( "Run the script again without --report to update.\n" ); |
| | 53 | + } |
| 53 | 54 | } else { |
| 54 | 55 | $ton = $to->getName(); |
| 55 | 56 | $this->error( "User '{$ton}' not found." ); |
| Index: trunk/phase3/maintenance/convertLinks.php |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | |
| 55 | 55 | global $wgContLang; |
| 56 | 56 | |
| 57 | | - $tuplesAdded = $numBadLinks = $curRowsRead = 0; # counters etc |
| | 57 | + $numBadLinks = $curRowsRead = 0; # counters etc |
| 58 | 58 | $totalTuplesInserted = 0; # total tuples INSERTed into links_temp |
| 59 | 59 | |
| 60 | 60 | $reportCurReadProgress = true; # whether or not to give progress reports while reading IDs from cur table |
| Index: trunk/phase3/includes/ProfilerStub.php |
| — | — | @@ -30,12 +30,15 @@ |
| 31 | 31 | */ |
| 32 | 32 | function wfProfileOut( $fn = '' ) { |
| 33 | 33 | global $hackwhere, $wgDBname, $haveProctitle; |
| 34 | | - if( !$haveProctitle ) |
| | 34 | + if( !$haveProctitle ) { |
| 35 | 35 | return; |
| 36 | | - if( count( $hackwhere ) ) |
| | 36 | + } |
| | 37 | + if( count( $hackwhere ) ) { |
| 37 | 38 | array_pop( $hackwhere ); |
| 38 | | - if( count( $hackwhere ) ) |
| | 39 | + } |
| | 40 | + if( count( $hackwhere ) ) { |
| 39 | 41 | setproctitle( $hackwhere[count( $hackwhere )-1] . " [$wgDBname]" ); |
| | 42 | + } |
| 40 | 43 | } |
| 41 | 44 | |
| 42 | 45 | /** |
| Index: trunk/phase3/includes/api/ApiProtect.php |
| — | — | @@ -42,8 +42,6 @@ |
| 43 | 43 | global $wgUser, $wgRestrictionLevels; |
| 44 | 44 | $params = $this->extractRequestParams(); |
| 45 | 45 | |
| 46 | | - $titleObj = null; |
| 47 | | - |
| 48 | 46 | $titleObj = Title::newFromText( $params['title'] ); |
| 49 | 47 | if ( !$titleObj ) { |
| 50 | 48 | $this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) ); |
| Index: trunk/phase3/includes/api/ApiQueryAllmessages.php |
| — | — | @@ -54,7 +54,6 @@ |
| 55 | 55 | $prop = array_flip( (array)$params['prop'] ); |
| 56 | 56 | |
| 57 | 57 | // Determine which messages should we print |
| 58 | | - $messages_target = array(); |
| 59 | 58 | if ( in_array( '*', $params['messages'] ) ) { |
| 60 | 59 | $message_names = array_keys( Language::getMessagesFor( 'en' ) ); |
| 61 | 60 | sort( $message_names ); |
| Index: trunk/phase3/includes/api/ApiQueryUserInfo.php |
| — | — | @@ -43,13 +43,13 @@ |
| 44 | 44 | public function execute() { |
| 45 | 45 | $params = $this->extractRequestParams(); |
| 46 | 46 | $result = $this->getResult(); |
| 47 | | - $r = array(); |
| 48 | 47 | |
| 49 | 48 | if ( !is_null( $params['prop'] ) ) { |
| 50 | 49 | $this->prop = array_flip( $params['prop'] ); |
| 51 | 50 | } else { |
| 52 | 51 | $this->prop = array(); |
| 53 | 52 | } |
| | 53 | + |
| 54 | 54 | $r = $this->getCurrentUserInfo(); |
| 55 | 55 | $result->addValue( 'query', $this->getModuleName(), $r ); |
| 56 | 56 | } |
| Index: trunk/phase3/includes/api/ApiUndelete.php |
| — | — | @@ -42,8 +42,6 @@ |
| 43 | 43 | global $wgUser; |
| 44 | 44 | $params = $this->extractRequestParams(); |
| 45 | 45 | |
| 46 | | - $titleObj = null; |
| 47 | | - |
| 48 | 46 | if ( !$wgUser->isAllowed( 'undelete' ) ) { |
| 49 | 47 | $this->dieUsageMsg( array( 'permdenied-undelete' ) ); |
| 50 | 48 | } |
| Index: trunk/phase3/includes/specials/SpecialTags.php |
| — | — | @@ -42,7 +42,6 @@ |
| 43 | 43 | $wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>", 'tags-intro' ); |
| 44 | 44 | |
| 45 | 45 | // Write the headers |
| 46 | | - $html = ''; |
| 47 | 46 | $html = Xml::tags( 'tr', null, Xml::tags( 'th', null, wfMsgExt( 'tags-tag', 'parseinline' ) ) . |
| 48 | 47 | Xml::tags( 'th', null, wfMsgExt( 'tags-display-header', 'parseinline' ) ) . |
| 49 | 48 | Xml::tags( 'th', null, wfMsgExt( 'tags-description-header', 'parseinline' ) ) . |
| Index: trunk/phase3/includes/specials/SpecialNewimages.php |
| — | — | @@ -68,7 +68,6 @@ |
| 69 | 69 | } else { |
| 70 | 70 | $ts = false; |
| 71 | 71 | } |
| 72 | | - $sql = ''; |
| 73 | 72 | |
| 74 | 73 | # If we were clever, we'd use this to cache. |
| 75 | 74 | $latestTimestamp = wfTimestamp( TS_MW, $ts ); |
| — | — | @@ -100,7 +99,7 @@ |
| 101 | 100 | $where[] = "img_timestamp >= '" . $dbr->timestamp( $from ) . "'"; |
| 102 | 101 | $invertSort = true; |
| 103 | 102 | } |
| 104 | | - $sql='SELECT img_size, img_name, img_user, img_user_text,'. |
| | 103 | + $sql = 'SELECT img_size, img_name, img_user, img_user_text,'. |
| 105 | 104 | "img_description,img_timestamp FROM $image"; |
| 106 | 105 | |
| 107 | 106 | if( $hidebotsql ) { |