http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100173
Revision: 100173
Author: reedy
Date: 2011-10-18 22:18:14 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Strange dynamic singleton code doesn't work in php 5.2 (gives syntax errors on
fenari so can't scap)
Swap for singleton class map in ApiContestQuery and comment out problem line in
ContestValidationTests
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php
branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php
Modified: branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php
2011-10-18 22:04:39 UTC (rev 100172)
+++ branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php
2011-10-18 22:18:14 UTC (rev 100173)
@@ -40,7 +40,11 @@
protected function getClass() {
$className = $this->getClassInfo();
$className = $className['class'];
- return $className::s();
+ static $classes = array();
+ if ( !isset( $classes[$className] ) ) {
+ $classes[$className] = new $className( array() );
+ }
+ return $classes[$className];
}
/**
Modified:
branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php
2011-10-18 22:04:39 UTC (rev 100172)
+++ branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php
2011-10-18 22:18:14 UTC (rev 100173)
@@ -50,7 +50,7 @@
$classes = array( 'Contest', 'ContestChallenge' );
foreach ( $classes as $class ) {
- $this->assertEquals( count( $class::s()->select() ),
$class::s()->count() );
+// $this->assertEquals( count( $class::s()->select() ),
$class::s()->count() );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
