From f04183b0da7d4dc62739c5b246d775260b421f84 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Wed, 4 Feb 2009 19:43:30 +0000 Subject: [PATCH] Removed check for empty( $action ), seems to be old register_globals code, but since $action is set in index.php with $action = $wgRequest->getVal( 'action', 'view' ); it can't match empty() in "normal" conditions --- includes/OutputPage.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index b1a027570e..acf798650d 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -309,20 +309,20 @@ class OutputPage { } } - public function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; } + public function setHTMLTitle( $name ) { $this->mHTMLtitle = $name; } public function setPageTitle( $name ) { - global $action, $wgContLang; - $name = $wgContLang->convert($name, true); + global $wgContLang; + $name = $wgContLang->convert( $name, true ); $this->mPagetitle = $name; - if(!empty($action)) { - $taction = $this->getPageTitleActionText(); - if( !empty( $taction ) ) { - $name .= ' - '.$taction; - } + + $taction = $this->getPageTitleActionText(); + if( !empty( $taction ) ) { + $name .= ' - '.$taction; } $this->setHTMLTitle( wfMsg( 'pagetitle', $name ) ); } + public function getHTMLTitle() { return $this->mHTMLtitle; } public function getPageTitle() { return $this->mPagetitle; } public function setSubtitle( $str ) { $this->mSubtitle = /*$this->parse(*/$str/*)*/; } // @bug 2514 -- 2.20.1