| Index: trunk/phase3/skins/Standard.php |
| — | — | @@ -18,9 +18,6 @@ |
| 19 | 19 | var $skinname = 'standard', $stylename = 'standard', |
| 20 | 20 | $template = 'StandardTemplate'; |
| 21 | 21 | |
| 22 | | - /** |
| 23 | | - * |
| 24 | | - */ |
| 25 | 22 | function setupSkinUserCss( OutputPage $out ){ |
| 26 | 23 | parent::setupSkinUserCss( $out ); |
| 27 | 24 | $out->AddModuleStyles( 'skins.standard' ); |
| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | /* Members */ |
| 63 | 63 | |
| 64 | 64 | /** |
| 65 | | - * @var Cached skin object |
| | 65 | + * @var Skin Cached skin object |
| 66 | 66 | */ |
| 67 | 67 | var $skin; |
| 68 | 68 | |
| — | — | @@ -80,7 +80,7 @@ |
| 81 | 81 | $nav = $this->data['content_navigation']; |
| 82 | 82 | |
| 83 | 83 | if ( $wgVectorUseIconWatch ) { |
| 84 | | - $mode = $this->skin->mTitle->userIsWatching() ? 'unwatch' : 'watch'; |
| | 84 | + $mode = $this->skin->getTitle()->userIsWatching() ? 'unwatch' : 'watch'; |
| 85 | 85 | if ( isset($nav['actions'][$mode]) ) { |
| 86 | 86 | $nav['views'][$mode] = $nav['actions'][$mode]; |
| 87 | 87 | $nav['views'][$mode]['class'] = rtrim('icon ' . $nav['views'][$mode]['class'], ' '); |
| — | — | @@ -88,7 +88,8 @@ |
| 89 | 89 | unset($nav['actions'][$mode]); |
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | | - |
| | 92 | + |
| | 93 | + $xmlID = ''; |
| 93 | 94 | foreach ( $nav as $section => $links ) { |
| 94 | 95 | foreach ( $links as $key => $link ) { |
| 95 | 96 | if ( $section == "views" && !(isset($link["primary"]) && $link["primary"]) ) { |
| Index: trunk/phase3/skins/MonoBook.php |
| — | — | @@ -52,7 +52,12 @@ |
| 53 | 53 | * @ingroup Skins |
| 54 | 54 | */ |
| 55 | 55 | class MonoBookTemplate extends BaseTemplate { |
| | 56 | + |
| | 57 | + /** |
| | 58 | + * @var Skin |
| | 59 | + */ |
| 56 | 60 | var $skin; |
| | 61 | + |
| 57 | 62 | /** |
| 58 | 63 | * Template filter callback for MonoBook skin. |
| 59 | 64 | * Takes an associative array of data set from a SkinTemplate-based |
| Index: trunk/phase3/skins/Modern.php |
| — | — | @@ -32,6 +32,10 @@ |
| 33 | 33 | * @ingroup Skins |
| 34 | 34 | */ |
| 35 | 35 | class ModernTemplate extends MonoBookTemplate { |
| | 36 | + |
| | 37 | + /** |
| | 38 | + * @var Skin |
| | 39 | + */ |
| 36 | 40 | var $skin; |
| 37 | 41 | /** |
| 38 | 42 | * Template filter callback for Modern skin. |
| — | — | @@ -44,7 +48,6 @@ |
| 45 | 49 | function execute() { |
| 46 | 50 | global $wgRequest; |
| 47 | 51 | $this->skin = $skin = $this->data['skin']; |
| 48 | | - $action = $wgRequest->getText( 'action' ); |
| 49 | 52 | |
| 50 | 53 | // Suppress warnings to prevent notices about missing indexes in $this->data |
| 51 | 54 | wfSuppressWarnings(); |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -360,7 +360,10 @@ |
| 361 | 361 | $this->mTitle = $t; |
| 362 | 362 | } |
| 363 | 363 | |
| 364 | | - /** Get the title */ |
| | 364 | + /** Get the title |
| | 365 | + * |
| | 366 | + * @return Title |
| | 367 | + */ |
| 365 | 368 | public function getTitle() { |
| 366 | 369 | return $this->mTitle; |
| 367 | 370 | } |