Merge "Revert "Replace Linker::link() usage with LinkRenderer""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 9 Dec 2016 17:27:42 +0000 (17:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 9 Dec 2016 17:27:42 +0000 (17:27 +0000)
1  2 
includes/specials/SpecialRecentchanges.php

@@@ -95,7 -95,7 +95,7 @@@ class SpecialRecentChanges extends Chan
        }
  
        /**
 -       * Get custom show/hide filters
 +       * Get all custom filters
         *
         * @return array Map of filter URL param names to properties (msg/default)
         */
                        $extraOpts['category'] = $this->categoryFilterForm( $opts );
                }
  
 -              $tagFilter = ChangeTags::buildTagFilterSelector( $opts['tagfilter'] );
 +              $tagFilter = ChangeTags::buildTagFilterSelector(
 +                      $opts['tagfilter'], false, $this->getContext() );
                if ( count( $tagFilter ) ) {
                        $extraOpts['tagfilter'] = $tagFilter;
                }
                }
                unset( $value );
  
+               $text = htmlspecialchars( $title );
                if ( $active ) {
-                       $title = new HtmlArmor( '<strong>' . htmlspecialchars( $title ) . '</strong>' );
+                       $text = '<strong>' . $text . '</strong>';
                }
  
-               return $this->getLinkRenderer()->makeKnownLink( $this->getPageTitle(), $title, [], $params );
+               return Linker::linkKnown( $this->getPageTitle(), $text, [], $params );
        }
  
        /**
  
                $showhide = [ 'show', 'hide' ];
  
 -              foreach ( $this->getCustomFilters() as $key => $params ) {
 +              foreach ( $this->getRenderableCustomFilters( $this->getCustomFilters() ) as $key => $params ) {
                        $filters[$key] = $params['msg'];
                }
 +
                // Disable some if needed
                if ( !$user->useRCPatrol() ) {
                        unset( $filters['hidepatrolled'] );