http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96647
Revision: 96647
Author: nikerabbit
Date: 2011-09-09 05:17:05 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
Followup r96543, + is not the correct thing to use here
Modified Paths:
--------------
trunk/phase3/includes/LogEventsList.php
Modified: trunk/phase3/includes/LogEventsList.php
===================================================================
--- trunk/phase3/includes/LogEventsList.php 2011-09-09 05:04:35 UTC (rev
96646)
+++ trunk/phase3/includes/LogEventsList.php 2011-09-09 05:17:05 UTC (rev
96647)
@@ -976,7 +976,7 @@
$info = array(
'tables' => $tables,
'fields' => $fields,
- 'conds' => $conds + $this->mConds,
+ 'conds' => array_merge( $conds, $this->mConds ),
'options' => $options,
'join_conds' => $joins,
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
