Merge "Disallow css attr() with url type"

[lhc/web/wiklou.git] / includes / specials / SpecialRecentchanges.php

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 36ccd4a..cd3299c 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -159,6 +159,9 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                        if ( preg_match( '/^namespace=(\d+)$/', $bit, $m ) ) {
                                $opts['namespace'] = $m[1];
                        }
+                       if ( preg_match( '/^tagfilter=(.*)$/', $bit, $m ) ) {
+                               $opts['tagfilter'] = $m[1];
+                       }
                }
        }
 
@@ -281,7 +284,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
        }
 
        protected function getDB() {
-               return wfGetDB( DB_SLAVE, 'recentchanges' );
+               return wfGetDB( DB_REPLICA, 'recentchanges' );
        }
 
        public function outputFeedLinks() {
@@ -310,7 +313,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
        /**
         * Build and output the actual changes list.
         *
-        * @param array $rows Database rows
+        * @param ResultWrapper $rows Database rows
         * @param FormOptions $opts
         */
        public function outputChangesList( $rows, $opts ) {
@@ -795,18 +798,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                return true;
        }
 
-       /**
-        * How long to cache page when it is being included.
-        *
-        * @return int|bool Time in seconds, 0 to disable caching altogether
-        */
-       public function maxIncludeCacheTime() {
-               global $wgMiserMode;
-               if ( !$wgMiserMode ) {
-                       return 0;
-               } else {
-                       return 60*5;
-               }
+       protected function getCacheTTL() {
+               return 60 * 5;
        }
 
 }