| Index: trunk/extensions/CentralAuth/migratePass0.php |
| — | — | @@ -33,7 +33,6 @@ |
| 34 | 34 | $users[intval( $row->user_id )] = $row->user_name; |
| 35 | 35 | ++$migrated; |
| 36 | 36 | } |
| 37 | | - $dbr->freeResult( $result ); |
| 38 | 37 | |
| 39 | 38 | CentralAuthUser::storeMigrationData( $wgDBname, $users ); |
| 40 | 39 | |
| Index: trunk/extensions/CentralAuth/migratePass1.php |
| — | — | @@ -28,7 +28,6 @@ |
| 29 | 29 | migratePassOneReport( $migrated, $total, $start ); |
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | | - $dbBackground->freeResult( $result ); |
| 33 | 32 | migratePassOneReport( $migrated, $total, $start ); |
| 34 | 33 | echo "DONE\n"; |
| 35 | 34 | } |
| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -145,7 +145,6 @@ |
| 146 | 146 | "WHERE gu_name=?"; |
| 147 | 147 | $result = $dbr->safeQuery( $sql, wfWikiID(), $this->mName ); |
| 148 | 148 | $row = $dbr->fetchObject( $result ); |
| 149 | | - $dbr->freeResult( $result ); |
| 150 | 149 | |
| 151 | 150 | $this->loadFromRow( $row, true ); |
| 152 | 151 | $this->saveToCache(); |
| — | — | @@ -1338,7 +1337,6 @@ |
| 1339 | 1338 | foreach ( $result as $row ) { |
| 1340 | 1339 | $dbs[] = $row->ln_wiki; |
| 1341 | 1340 | } |
| 1342 | | - $dbw->freeResult( $result ); |
| 1343 | 1341 | |
| 1344 | 1342 | return $dbs; |
| 1345 | 1343 | } |
| — | — | @@ -1467,7 +1465,6 @@ |
| 1468 | 1466 | foreach ( $result as $row ) { |
| 1469 | 1467 | $wikis[] = $row->lu_wiki; |
| 1470 | 1468 | } |
| 1471 | | - $dbw->freeResult( $result ); |
| 1472 | 1469 | |
| 1473 | 1470 | $this->mAttachedArray = $wikis; |
| 1474 | 1471 | $this->mAttachedList = implode( "\n", $wikis ); |
| — | — | @@ -1520,7 +1517,6 @@ |
| 1521 | 1518 | $wikis[$row->lu_wiki] = array_merge( $wikis[$row->lu_wiki], |
| 1522 | 1519 | $this->localUserData( $row->lu_wiki ) ); |
| 1523 | 1520 | } |
| 1524 | | - $dbw->freeResult( $result ); |
| 1525 | 1521 | |
| 1526 | 1522 | return $wikis; |
| 1527 | 1523 | } |
| Index: trunk/extensions/CentralAuth/specials/SpecialCentralAuth.php |
| — | — | @@ -1,8 +1,14 @@ |
| 2 | 2 | <?php |
| 3 | 3 | class SpecialCentralAuth extends SpecialPage { |
| 4 | 4 | var $mUserName, $mCanUnmerge, $mCanLock, $mCanOversight, $mCanEdit; |
| 5 | | - var $mGlobalUser, $mAttachedLocalAccounts, $mUnattachedLocalAccounts; |
| 6 | 5 | |
| | 6 | + /** |
| | 7 | + * @var CentralAuthUser |
| | 8 | + */ |
| | 9 | + var $mGlobalUser; |
| | 10 | + |
| | 11 | + var $mAttachedLocalAccounts, $mUnattachedLocalAccounts; |
| | 12 | + |
| 7 | 13 | function __construct() { |
| 8 | 14 | parent::__construct( 'CentralAuth' ); |
| 9 | 15 | } |
| — | — | @@ -73,12 +79,15 @@ |
| 74 | 80 | $this->showUsernameForm(); |
| 75 | 81 | if ( $continue ) { |
| 76 | 82 | $this->showInfo(); |
| 77 | | - if ( $this->mCanLock ) |
| | 83 | + if ( $this->mCanLock ) { |
| 78 | 84 | $this->showStatusForm(); |
| 79 | | - if ( $this->mCanUnmerge ) |
| | 85 | + } |
| | 86 | + if ( $this->mCanUnmerge ) { |
| 80 | 87 | $this->showActionForm( 'delete' ); |
| 81 | | - if ( $this->mCanEdit ) |
| | 88 | + } |
| | 89 | + if ( $this->mCanEdit ) { |
| 82 | 90 | $this->showLogExtract(); |
| | 91 | + } |
| 83 | 92 | $this->showWikiLists(); |
| 84 | 93 | } |
| 85 | 94 | } |