| Index: trunk/extensions/CentralAuth/WikiSet.php |
| — | — | @@ -58,22 +58,22 @@ |
| 59 | 59 | ); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | | - public static function newFromName( $id, $useCache = true ) { |
| | 62 | + public static function newFromName( $name, $useCache = true ) { |
| 63 | 63 | if( $useCache ) { |
| 64 | 64 | global $wgMemc; |
| 65 | | - $data = $wgMemc->get( self::memcKey( "name:" . md5( $id ) ) ); |
| | 65 | + $data = $wgMemc->get( self::memcKey( "name:" . md5( $name ) ) ); |
| 66 | 66 | if( $data ) { |
| 67 | 67 | if( $data['mVersion'] == self::VERSION ) { |
| 68 | 68 | $ws = new WikiSet( null, null, null ); |
| 69 | | - foreach( $data as $name => $val ) |
| 70 | | - $ws->$name = $val; |
| | 69 | + foreach( $data as $key => $val ) |
| | 70 | + $ws->$key = $val; |
| 71 | 71 | return $ws; |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | $dbr = CentralAuthUser::getCentralSlaveDB(); |
| 76 | 76 | $row = $dbr->selectRow( |
| 77 | | - 'wikiset', '*', array( 'ws_name' => $id ), __METHOD__ |
| | 77 | + 'wikiset', '*', array( 'ws_name' => $name ), __METHOD__ |
| 78 | 78 | ); |
| 79 | 79 | if( !$row ) |
| 80 | 80 | return null; |