Merge "Do not call purgeExpiredRestrictions on simple page views"

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

diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index 04c2fe9..9315eb8 100644 (file)
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -97,13 +97,13 @@ class SpecialLog extends SpecialPage {
                        }
                } else {
                        // Allow extensions to add relations to their search types
-                       wfRunHooks( 'SpecialLogAddLogSearchRelations', array( $opts->getValue( 'type' ), $this->getRequest(), &$qc ) );
+                       Hooks::run( 'SpecialLogAddLogSearchRelations', array( $opts->getValue( 'type' ), $this->getRequest(), &$qc ) );
                }
 
                # Some log types are only for a 'User:' title but we might have been given
                # only the username instead of the full title 'User:username'. This part try
                # to lookup for a user by that name and eventually fix user input. See bug 1697.
-               wfRunHooks( 'GetLogTypesOnUser', array( &$this->typeOnUser ) );
+               Hooks::run( 'GetLogTypesOnUser', array( &$this->typeOnUser ) );
                if ( in_array( $opts->getValue( 'type' ), $this->typeOnUser ) ) {
                        # ok we have a type of log which expect a user title.
                        $target = Title::newFromText( $opts->getValue( 'page' ) );
@@ -237,8 +237,9 @@ class SpecialLog extends SpecialPage {
         */
        protected function addHeader( $type ) {
                $page = new LogPage( $type );
-               $this->getOutput()->setPageTitle( $page->getName()->text() );
-               $this->getOutput()->addHTML( $page->getDescription()->parseAsBlock() );
+               $this->getOutput()->setPageTitle( $page->getName() );
+               $this->getOutput()->addHTML( $page->getDescription()
+                       ->setContext( $this->getContext() )->parseAsBlock() );
        }
 
        protected function getGroupName() {