* (bug 22315) SpecialRecentChangesQuery hook now pass $query_options and checks the...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c0ccb2b..e901672 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -312,6 +312,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   restrict/expand it.
 * (bug 21936) When a revision has been patrolled, there's now a link back to the
   article
+* (bug 22315) SpecialRecentChangesQuery hook now pass $query_options and checks
+  the return value
 
 === Bug fixes in 1.16 ===
 

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 156feb9..a74d4bc 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1479,6 +1479,7 @@ SpecialRecentChanges
 &$tables: array of tables to be queried
 &$join_conds: join conditions for the tables
 $opts: FormOptions for this request
+&$query_options: array of options for the database request
 
 'SpecialSearchNogomatch': called when user clicked the "Go" button but the
 target doesn't exist

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 1f4bb7c..dca658c 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -295,7 +295,8 @@ class SpecialRecentChanges extends SpecialPage {
                        $tables, $fields, $conds, $join_conds, $query_options, $opts['tagfilter']
                );
 
-               wfRunHooks('SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts ) );
+               if ( !wfRunHooks( 'SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts, &$query_options ) ) )
+                       return false;
 
                // Don't use the new_namespace_time timestamp index if:
                // (a) "All namespaces" selected