Index: trunk/phase3/includes/OutputPage.php |
— | — | @@ -309,20 +309,20 @@ |
310 | 310 | } |
311 | 311 | } |
312 | 312 | |
313 | | - public function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; } |
| 313 | + public function setHTMLTitle( $name ) { $this->mHTMLtitle = $name; } |
314 | 314 | public function setPageTitle( $name ) { |
315 | | - global $action, $wgContLang; |
316 | | - $name = $wgContLang->convert($name, true); |
| 315 | + global $wgContLang; |
| 316 | + $name = $wgContLang->convert( $name, true ); |
317 | 317 | $this->mPagetitle = $name; |
318 | | - if(!empty($action)) { |
319 | | - $taction = $this->getPageTitleActionText(); |
320 | | - if( !empty( $taction ) ) { |
321 | | - $name .= ' - '.$taction; |
322 | | - } |
| 318 | + |
| 319 | + $taction = $this->getPageTitleActionText(); |
| 320 | + if( !empty( $taction ) ) { |
| 321 | + $name .= ' - '.$taction; |
323 | 322 | } |
324 | 323 | |
325 | 324 | $this->setHTMLTitle( wfMsg( 'pagetitle', $name ) ); |
326 | 325 | } |
| 326 | + |
327 | 327 | public function getHTMLTitle() { return $this->mHTMLtitle; } |
328 | 328 | public function getPageTitle() { return $this->mPagetitle; } |
329 | 329 | public function setSubtitle( $str ) { $this->mSubtitle = /*$this->parse(*/$str/*)*/; } // @bug 2514 |