Followup r96543, + is not the correct thing to use here
authorNiklas Laxström <nikerabbit@users.mediawiki.org>
Fri, 9 Sep 2011 05:17:05 +0000 (05:17 +0000)
committerNiklas Laxström <nikerabbit@users.mediawiki.org>
Fri, 9 Sep 2011 05:17:05 +0000 (05:17 +0000)
includes/LogEventsList.php

index 1188c50..a6da010 100644 (file)
@@ -976,7 +976,7 @@ class LogPager extends ReverseChronologicalPager {
                $info = array(
                        'tables'     => $tables,
                        'fields'     => $fields,
-                       'conds'      => $conds + $this->mConds,
+                       'conds'      => array_merge( $conds, $this->mConds ),
                        'options'    => $options,
                        'join_conds' => $joins,
                );