| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -870,7 +870,6 @@ |
| 871 | 871 | # @todo FIXME: This is expensive; cache this info somewhere. |
| 872 | 872 | |
| 873 | 873 | $dbr = wfGetDB( DB_SLAVE ); |
| 874 | | - $userTable = $dbr->tableName( 'user' ); |
| 875 | 874 | |
| 876 | 875 | if ( $dbr->implicitGroupby() ) { |
| 877 | 876 | $realNameField = 'user_real_name'; |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -950,7 +950,6 @@ |
| 951 | 951 | * @private |
| 952 | 952 | */ |
| 953 | 953 | function getCellAttr ( $cell, $tagName ) { |
| 954 | | - $content = null; |
| 955 | 954 | $attributes = null; |
| 956 | 955 | |
| 957 | 956 | $cell = trim ( $cell ); |
| — | — | @@ -965,8 +964,7 @@ |
| 966 | 965 | } |
| 967 | 966 | else if ( count ( $cellData ) == 1 ) { |
| 968 | 967 | $content = trim ( $cellData[0] ); |
| 969 | | - } |
| 970 | | - else { |
| | 968 | + } else { |
| 971 | 969 | $attributes = $this->mStripState->unstripBoth( $cellData[0] ); |
| 972 | 970 | $attributes = Sanitizer::fixTagAttributes( $attributes , $tagName ); |
| 973 | 971 | |
| Index: trunk/phase3/includes/revisiondelete/RevisionDelete.php |
| — | — | @@ -53,10 +53,10 @@ |
| 54 | 54 | } else { |
| 55 | 55 | // Combine the two! Whee |
| 56 | 56 | $rows = array(); |
| 57 | | - while ( $row = $live->fetchObject() ) { |
| | 57 | + foreach ( $live as $row ) { |
| 58 | 58 | $rows[$row->rev_id] = $row; |
| 59 | 59 | } |
| 60 | | - while ( $row = $archived->fetchObject() ) { |
| | 60 | + foreach ( $archived as $row ) { |
| 61 | 61 | $rows[$row->ar_rev_id] = $row; |
| 62 | 62 | } |
| 63 | 63 | krsort( $rows ); |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -731,7 +731,6 @@ |
| 732 | 732 | |
| 733 | 733 | // Validate password |
| 734 | 734 | $msg = false; |
| 735 | | - $valid = false; |
| 736 | 735 | $pwd = $this->getVar( '_AdminPassword' ); |
| 737 | 736 | $user = User::newFromName( $cname ); |
| 738 | 737 | $valid = $user && $user->getPasswordValidity( $pwd ); |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -319,7 +319,7 @@ |
| 320 | 320 | * @return String: HTML fragment |
| 321 | 321 | */ |
| 322 | 322 | protected function getForm() { |
| 323 | | - global $wgScript, $wgMiserMode, $wgRCMaxAge, $wgContLang; |
| | 323 | + global $wgScript, $wgMiserMode; |
| 324 | 324 | |
| 325 | 325 | $this->opts['title'] = $this->getTitle()->getPrefixedText(); |
| 326 | 326 | if( !isset( $this->opts['target'] ) ) { |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -689,12 +689,14 @@ |
| 690 | 690 | $rp .= "+(\\$i)"; |
| 691 | 691 | } |
| 692 | 692 | |
| 693 | | - $rx = "/$rx/Sei"; $O = substr("$alpha')", 1); |
| | 693 | + $rx = "/$rx/Sei"; |
| | 694 | + $O = substr("$alpha')", 1); |
| 694 | 695 | for ( $i = 1; $i <= strlen( $rx ) / 3; $i++ ) { |
| 695 | 696 | $rx[$i-1] = strtolower( $rx[$i-1] ); |
| 696 | 697 | } |
| 697 | 698 | $ry = ".*?(.((.)(.))).{1,3}(.)(.{1,$i})(\\4.\\3)(.).*"; |
| 698 | | - $ry = "/$ry/Sei"; $O = substr("$beta')", 1); |
| | 699 | + $ry = "/$ry/Sei"; |
| | 700 | + $O = substr("$beta')", 1); |
| 699 | 701 | preg_match_all('/(?<=\$)[[:alnum:]]*/',substr($juliet, 0, $i<<1), $charlie); |
| 700 | 702 | foreach( $charlie[0] as $bravo ) { |
| 701 | 703 | $$bravo =& $xe; |
| Index: trunk/phase3/includes/Metadata.php |
| — | — | @@ -88,10 +88,11 @@ |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | protected function pageOrString( $name, $page, $str ) { |
| 92 | | - if( $page instanceof Title ) |
| | 92 | + if( $page instanceof Title ) { |
| 93 | 93 | $nt = $page; |
| 94 | | - else |
| | 94 | + } else { |
| 95 | 95 | $nt = Title::newFromText( $page ); |
| | 96 | + } |
| 96 | 97 | |
| 97 | 98 | if( !$nt || $nt->getArticleID() == 0 ){ |
| 98 | 99 | $this->element( $name, $str ); |