https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113145

Revision: 113145
Author:   jeroendedauw
Date:     2012-03-06 16:04:35 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
fix fatal from 
http://education.wmflabs.org/index.php/Thread:MW_1.18_talk:Community_portal/Special:CampusAmbassadors

Modified Paths:
--------------
    trunk/extensions/EducationProgram/includes/EPCAPager.php
    trunk/extensions/EducationProgram/includes/EPOAPager.php

Modified: trunk/extensions/EducationProgram/includes/EPCAPager.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPCAPager.php    2012-03-06 
15:58:01 UTC (rev 113144)
+++ trunk/extensions/EducationProgram/includes/EPCAPager.php    2012-03-06 
16:04:35 UTC (rev 113145)
@@ -12,6 +12,7 @@
  * @author Jeroen De Dauw < [email protected] >
  */
 class EPCAPager extends EPOAPager {
+
        /**
         * Constructor.
         *
@@ -19,8 +20,7 @@
         * @param array $conds
         */
        public function __construct( IContextSource $context, array $conds = 
array() ) {
-               parent::__construct( $context, $conds );
-               $this->table = EPCAs::singleton();
+               parent::__construct( $context, $conds, EPCAs::singleton() );
        }
 
        /**

Modified: trunk/extensions/EducationProgram/includes/EPOAPager.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPOAPager.php    2012-03-06 
15:58:01 UTC (rev 113144)
+++ trunk/extensions/EducationProgram/includes/EPOAPager.php    2012-03-06 
16:04:35 UTC (rev 113145)
@@ -18,10 +18,16 @@
         *
         * @param IContextSource $context
         * @param array $conds
+        * @param DBTable|null $table
         */
-       public function __construct( IContextSource $context, array $conds = 
array() ) {
+       public function __construct( IContextSource $context, array $conds = 
array(), DBTable $table = null ) {
                $this->mDefaultDirection = true;
-               parent::__construct( $context, $conds, EPOAs::singleton() );
+
+               parent::__construct(
+                       $context,
+                       $conds,
+                       is_null( $table ) ? EPOAs::singleton() : $table
+               );
        }
 
        /**


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to