| Index: trunk/phase3/maintenance/checkUsernames.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | foreach ( $res as $row ) { |
| 47 | 47 | if ( ! User::isValidUserName( $row->user_name ) ) { |
| 48 | 48 | $this->error( sprintf( "%s: %6d: '%s'\n", wfWikiID(), $row->user_id, $row->user_name ) ); |
| 49 | | - wfDebugLog( 'checkUsernames', $out ); |
| | 49 | + wfDebugLog( 'checkUsernames', $$row->user_name ); |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | } |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -535,8 +535,6 @@ |
| 536 | 536 | * @param int $height |
| 537 | 537 | */ |
| 538 | 538 | private function makeSizeLink( $params, $width, $height ) { |
| 539 | | - global $wgLang; |
| 540 | | - |
| 541 | 539 | $params['width'] = $width; |
| 542 | 540 | $params['height'] = $height; |
| 543 | 541 | $thumbnail = $this->displayImg->transform( $params ); |
| Index: trunk/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -932,7 +932,7 @@ |
| 933 | 933 | $overhead = "SAVEPOINT $ignore ON ROLLBACK RETAIN CURSORS"; |
| 934 | 934 | db2_exec( $this->mConn, $overhead, $this->mStmtOptions ); |
| 935 | 935 | |
| 936 | | - $this->execute( $stmt, $row ); |
| | 936 | + $res2 = $this->execute( $stmt, $row ); |
| 937 | 937 | |
| 938 | 938 | if ( !$res2 ) { |
| 939 | 939 | $this->installPrint( 'Last error:' ); |
| Index: trunk/phase3/includes/Feed.php |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | */ |
| 103 | 103 | public function setUniqueId($uniqueId, $RSSisPermalink = false) { |
| 104 | 104 | $this->UniqueId = $uniqueId; |
| 105 | | - $this->RSSIsPermalink = $isPermalink; |
| | 105 | + $this->RSSIsPermalink = $RSSisPermalink; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
| Index: trunk/phase3/includes/api/ApiQueryImageInfo.php |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | } |
| 109 | 109 | break; |
| 110 | 110 | } |
| 111 | | - |
| | 111 | + |
| 112 | 112 | // Check if we can make the requested thumbnail, and get transform parameters. |
| 113 | 113 | $finalThumbParams = $this->mergeThumbParams( $img, $scale, $params['urlparam'] ); |
| 114 | 114 | |
| — | — | @@ -119,7 +119,7 @@ |
| 120 | 120 | ( is_null( $params['end'] ) || $img->getTimestamp() >= $params['end'] ) |
| 121 | 121 | ) { |
| 122 | 122 | $gotOne = true; |
| 123 | | - |
| | 123 | + |
| 124 | 124 | $fit = $this->addPageSubItem( $pageId, |
| 125 | 125 | self::getInfo( $img, $prop, $result, $finalThumbParams ) ); |
| 126 | 126 | if ( !$fit ) { |
| — | — | @@ -383,7 +383,7 @@ |
| 384 | 384 | if ( $mime ) { |
| 385 | 385 | $vals['mime'] = $file->getMimeType(); |
| 386 | 386 | } |
| 387 | | - |
| | 387 | + |
| 388 | 388 | if ( $mediatype ) { |
| 389 | 389 | $vals['mediatype'] = $file->getMediaType(); |
| 390 | 390 | } |