From d677412428c9667c2043a7b0298782f793591cd0 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sat, 19 Feb 2011 21:16:47 +0000 Subject: [PATCH] Improve method documentation Few bits of fixup --- includes/Skin.php | 5 ++++- skins/Modern.php | 5 ++++- skins/MonoBook.php | 5 +++++ skins/Standard.php | 3 --- skins/Vector.php | 7 ++++--- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/includes/Skin.php b/includes/Skin.php index ceb8cb1c8b..7d0c549894 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -360,7 +360,10 @@ abstract class Skin extends Linker { $this->mTitle = $t; } - /** Get the title */ + /** Get the title + * + * @return Title + */ public function getTitle() { return $this->mTitle; } diff --git a/skins/Modern.php b/skins/Modern.php index 062d571f0d..017be88461 100644 --- a/skins/Modern.php +++ b/skins/Modern.php @@ -32,6 +32,10 @@ class SkinModern extends SkinTemplate { * @ingroup Skins */ class ModernTemplate extends MonoBookTemplate { + + /** + * @var Skin + */ var $skin; /** * Template filter callback for Modern skin. @@ -44,7 +48,6 @@ class ModernTemplate extends MonoBookTemplate { function execute() { global $wgRequest; $this->skin = $skin = $this->data['skin']; - $action = $wgRequest->getText( 'action' ); // Suppress warnings to prevent notices about missing indexes in $this->data wfSuppressWarnings(); diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 061f4f6544..18e6b9fd40 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -52,7 +52,12 @@ class SkinMonoBook extends SkinTemplate { * @ingroup Skins */ class MonoBookTemplate extends BaseTemplate { + + /** + * @var Skin + */ var $skin; + /** * Template filter callback for MonoBook skin. * Takes an associative array of data set from a SkinTemplate-based diff --git a/skins/Standard.php b/skins/Standard.php index fb54621c32..38ed860b47 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -18,9 +18,6 @@ class SkinStandard extends SkinLegacy { var $skinname = 'standard', $stylename = 'standard', $template = 'StandardTemplate'; - /** - * - */ function setupSkinUserCss( OutputPage $out ){ parent::setupSkinUserCss( $out ); $out->AddModuleStyles( 'skins.standard' ); diff --git a/skins/Vector.php b/skins/Vector.php index 174969dd0b..508e7857ed 100644 --- a/skins/Vector.php +++ b/skins/Vector.php @@ -61,7 +61,7 @@ class VectorTemplate extends BaseTemplate { /* Members */ /** - * @var Cached skin object + * @var Skin Cached skin object */ var $skin; @@ -80,7 +80,7 @@ class VectorTemplate extends BaseTemplate { $nav = $this->data['content_navigation']; if ( $wgVectorUseIconWatch ) { - $mode = $this->skin->mTitle->userIsWatching() ? 'unwatch' : 'watch'; + $mode = $this->skin->getTitle()->userIsWatching() ? 'unwatch' : 'watch'; if ( isset($nav['actions'][$mode]) ) { $nav['views'][$mode] = $nav['actions'][$mode]; $nav['views'][$mode]['class'] = rtrim('icon ' . $nav['views'][$mode]['class'], ' '); @@ -88,7 +88,8 @@ class VectorTemplate extends BaseTemplate { unset($nav['actions'][$mode]); } } - + + $xmlID = ''; foreach ( $nav as $section => $links ) { foreach ( $links as $key => $link ) { if ( $section == "views" && !(isset($link["primary"]) && $link["primary"]) ) { -- 2.20.1