http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54605

Revision: 54605
Author:   mrzman
Date:     2009-08-07 21:12:38 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
Copy DatabaseBase::unionQueries() from trunk for BC

Modified Paths:
--------------
    trunk/extensions/IndexFunction/SpecialIndex.php

Modified: trunk/extensions/IndexFunction/SpecialIndex.php
===================================================================
--- trunk/extensions/IndexFunction/SpecialIndex.php     2009-08-07 21:10:41 UTC 
(rev 54604)
+++ trunk/extensions/IndexFunction/SpecialIndex.php     2009-08-07 21:12:38 UTC 
(rev 54605)
@@ -133,13 +133,20 @@
                        array( 'page' => array('JOIN','page_id=in_from') )
                );
                
-               $union = $this->mDb->unionQueries( array( $pagequery, 
$indexquery ), false );
+               $union = $this->unionQueries( array( $pagequery, $indexquery ), 
false );
                $union .= $order . $limit;              
 
                $res = $this->mDb->query( $union, __METHOD__ );
                return new ResultWrapper( $this->mDb, $res );
        }
+       
+       // Copied from Database.php on MW trunk
+       function unionQueries($sqls, $all) {
+               $glue = $all ? ') UNION ALL (' : ') UNION (';
+               return '('.implode( $glue, $sqls ) . ')';
+       }
 
+
 }
 
 class SpecialIndex extends SpecialPage {



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to