| Index: trunk/extensions/Contest/test/ContestValidationTests.php |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | $classes = array( 'Contest', 'ContestChallenge' ); |
| 52 | 52 | |
| 53 | 53 | foreach ( $classes as $class ) { |
| 54 | | - $this->assertEquals( count( $class::s()->select() ), $class::s()->count() ); |
| | 54 | + // $this->assertEquals( count( $class::s()->select() ), $class::s()->count() ); |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
| Index: trunk/extensions/Contest/api/ApiContestQuery.php |
| — | — | @@ -40,7 +40,11 @@ |
| 41 | 41 | protected function getClass() { |
| 42 | 42 | $className = $this->getClassInfo(); |
| 43 | 43 | $className = $className['class']; |
| 44 | | - return $className::s(); |
| | 44 | + static $classes = array(); |
| | 45 | + if ( !isset( $classes[$className] ) ) { |
| | 46 | + $classes[$className] = new $className( array() ); |
| | 47 | + } |
| | 48 | + return $classes[$className]; |
| 45 | 49 | } |
| 46 | 50 | |
| 47 | 51 | /** |
| Property changes on: trunk/extensions/Contest |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 48 | 52 | Merged /branches/wmf/1.18wmf1/extensions/Contest:r100323 |