| Index: branches/wmf/1.19wmf1/extensions/AntiSpoof/SpoofUser.php |
| — | — | @@ -36,7 +36,7 @@ |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * Get the normalized key form |
| 40 | | - * @return string|nuyll |
| | 40 | + * @return string|null |
| 41 | 41 | */ |
| 42 | 42 | public function getNormalized() { |
| 43 | 43 | return $this->mNormalized; |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | * @return array empty if no conflict, or array containing conflicting usernames |
| 50 | 50 | */ |
| 51 | 51 | public function getConflicts() { |
| 52 | | - $dbr = self::getDBSlave(); |
| | 52 | + $dbr = static::getDBSlave(); |
| 53 | 53 | |
| 54 | 54 | // Join against the user table to ensure that we skip stray |
| 55 | 55 | // entries left after an account is renamed or otherwise munged. |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | foreach ( $items as $item ) { |
| 110 | 110 | $fields[] = $item->insertFields(); |
| 111 | 111 | } |
| 112 | | - $dbw = self::getDBMaster(); |
| | 112 | + $dbw = static::getDBMaster(); |
| 113 | 113 | $dbw->replace( |
| 114 | 114 | 'spoofuser', |
| 115 | 115 | array( 'su_name' ), |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | * @param $oldName |
| 123 | 123 | */ |
| 124 | 124 | public function update( $oldName ) { |
| 125 | | - $dbw = self::getDBMaster(); |
| | 125 | + $dbw = static::getDBMaster(); |
| 126 | 126 | |
| 127 | 127 | if( $this->record() ) { |
| 128 | 128 | $dbw->delete( |
| Index: branches/wmf/1.19wmf1/extensions/AntiSpoof/AntiSpoofHooks.php |
| — | — | @@ -52,7 +52,7 @@ |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | $name = $user->getName(); |
| 56 | | - $spoof = self::makeSpoofUser( $name ); |
| | 56 | + $spoof = static::makeSpoofUser( $name ); |
| 57 | 57 | if ( $spoof->isLegal() ) { |
| 58 | 58 | $normalized = $spoof->getNormalized(); |
| 59 | 59 | $conflicts = $spoof->getConflicts(); |
| — | — | @@ -108,7 +108,7 @@ |
| 109 | 109 | * @return bool |
| 110 | 110 | */ |
| 111 | 111 | public static function asAddNewAccountHook( $user ) { |
| 112 | | - $spoof = self::makeSpoofUser( $user->getName() ); |
| | 112 | + $spoof = static::makeSpoofUser( $user->getName() ); |
| 113 | 113 | $spoof->record(); |
| 114 | 114 | return true; |
| 115 | 115 | } |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | * @return bool |
| 125 | 125 | */ |
| 126 | 126 | public static function asAddRenameUserHook( $uid, $oldName, $newName ) { |
| 127 | | - $spoof = self::makeSpoofUser( $newName ); |
| | 127 | + $spoof = static::makeSpoofUser( $newName ); |
| 128 | 128 | $spoof->update( $oldName ); |
| 129 | 129 | return true; |
| 130 | 130 | } |
| Property changes on: branches/wmf/1.19wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 131 | 131 | Merged /trunk/extensions:r111688,111690 |