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

Revision: 112125
Author:   jeroendedauw
Date:     2012-02-22 18:08:55 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
fix filter issue

Modified Paths:
--------------
    trunk/extensions/EducationProgram/includes/EPRoleObject.php

Modified: trunk/extensions/EducationProgram/includes/EPRoleObject.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPRoleObject.php 2012-02-22 
17:54:53 UTC (rev 112124)
+++ trunk/extensions/EducationProgram/includes/EPRoleObject.php 2012-02-22 
18:08:55 UTC (rev 112125)
@@ -252,10 +252,10 @@
                $result = wfGetDB( DB_SLAVE )->select(
                        array( 'ep_courses', 'ep_users_per_course' ),
                        $courseTable->getPrefixedFields( is_null( $fields ) ? 
$courseTable->getFieldNames() : (array)$fields ),
-                       array(
+                       array_merge( array(
                                'upc_role' => $this->getRoleId(),
                                'upc_user_id' => $this->getField( 'user_id' ),
-                       ),
+                       ), EPCourses::singleton()->getPrefixedValues( 
$conditions ) ),
                        __METHOD__,
                        array(),
                        array(


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

Reply via email to