| Index: trunk/phase3/includes/SpecialPageFactory.php |
| — | — | @@ -457,7 +457,7 @@ |
| 458 | 458 | $page->including( $including ); |
| 459 | 459 | |
| 460 | 460 | // Execute special page |
| 461 | | - $profName = 'Special:' . $page->name(); |
| | 461 | + $profName = 'Special:' . $page->getName(); |
| 462 | 462 | wfProfileIn( $profName ); |
| 463 | 463 | $page->execute( $par ); |
| 464 | 464 | wfProfileOut( $profName ); |
| Index: trunk/phase3/includes/SpecialPage.php |
| — | — | @@ -380,20 +380,11 @@ |
| 381 | 381 | } |
| 382 | 382 | } |
| 383 | 383 | |
| 384 | | - /**#@+ |
| 385 | | - * Accessor |
| 386 | | - * |
| 387 | | - * @deprecated |
| 388 | | - */ |
| 389 | 384 | function getName() { return $this->mName; } |
| 390 | 385 | function getRestriction() { return $this->mRestriction; } |
| 391 | 386 | function getFile() { return $this->mFile; } |
| 392 | 387 | function isListed() { return $this->mListed; } |
| 393 | | - /**#@-*/ |
| 394 | 388 | |
| 395 | | - /**#@+ |
| 396 | | - * Accessor and mutator |
| 397 | | - */ |
| 398 | 389 | function name( $x = null ) { return wfSetVar( $this->mName, $x ); } |
| 399 | 390 | function restrictions( $x = null) { |
| 400 | 391 | # Use the one below this |
| — | — | @@ -406,7 +397,6 @@ |
| 407 | 398 | function file( $x = null) { return wfSetVar( $this->mFile, $x ); } |
| 408 | 399 | function includable( $x = null ) { return wfSetVar( $this->mIncludable, $x ); } |
| 409 | 400 | function including( $x = null ) { return wfSetVar( $this->mIncluding, $x ); } |
| 410 | | - /**#@-*/ |
| 411 | 401 | |
| 412 | 402 | /** |
| 413 | 403 | * Get the localised name of the special page |
| — | — | @@ -506,7 +496,7 @@ |
| 507 | 497 | global $wgContLang; |
| 508 | 498 | |
| 509 | 499 | if( $summaryMessageKey == '' ) { |
| 510 | | - $msg = $wgContLang->lc( $this->name() ) . '-summary'; |
| | 500 | + $msg = $wgContLang->lc( $this->getName() ) . '-summary'; |
| 511 | 501 | } else { |
| 512 | 502 | $msg = $summaryMessageKey; |
| 513 | 503 | } |