| Index: trunk/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( |