http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89123
Revision: 89123
Author: reedy
Date: 2011-05-29 18:32:30 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Fix up a couple of deprecated calls
Documentation
Modified Paths:
--------------
trunk/phase3/skins/Chick.php
trunk/phase3/skins/CologneBlue.php
trunk/phase3/skins/Modern.php
trunk/phase3/skins/MonoBook.php
trunk/phase3/skins/Nostalgia.php
trunk/phase3/skins/Simple.php
trunk/phase3/skins/Standard.php
trunk/phase3/skins/Vector.php
Modified: trunk/phase3/skins/Chick.php
===================================================================
--- trunk/phase3/skins/Chick.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/Chick.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -21,6 +21,9 @@
var $skinname = 'chick', $stylename = 'chick',
$template = 'MonoBookTemplate', $useHeadElement = true;
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ){
parent::setupSkinUserCss( $out );
Modified: trunk/phase3/skins/CologneBlue.php
===================================================================
--- trunk/phase3/skins/CologneBlue.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/CologneBlue.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -19,6 +19,9 @@
var $skinname = 'cologneblue', $stylename = 'cologneblue',
$template = 'CologneBlueTemplate';
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ){
parent::setupSkinUserCss( $out );
$out->addModuleStyles( 'skins.cologneblue' );
@@ -55,6 +58,9 @@
class CologneBlueTemplate extends LegacyTemplate {
+ /**
+ * @return string
+ */
function doBeforeContent() {
$mainPageObj = Title::newMainPage();
@@ -95,6 +101,9 @@
return $s;
}
+ /**
+ * @return string
+ */
function doAfterContent(){
global $wgLang;
@@ -136,6 +145,9 @@
return $s;
}
+ /**
+ * @return string
+ */
function sysLinks() {
global $wgUser, $wgLang;
$li = SpecialPage::getTitleFor( 'Userlogin' );
@@ -194,6 +206,8 @@
/**
* Compute the sidebar
* @access private
+ *
+ * @return string
*/
function quickBar(){
global $wgOut, $wgUser;
@@ -347,11 +361,19 @@
return $s;
}
+ /**
+ * @param $key string
+ * @return string
+ */
function menuHead( $key ) {
$s = "\n<h6>" . wfMsg( $key ) . "</h6>";
return $s;
}
+ /**
+ * @param $label string
+ * @return string
+ */
function searchForm( $label = '' ) {
global $wgRequest, $wgUseTwoButtonsSearchForm;
Modified: trunk/phase3/skins/Modern.php
===================================================================
--- trunk/phase3/skins/Modern.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/Modern.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -21,6 +21,9 @@
var $skinname = 'modern', $stylename = 'modern',
$template = 'ModernTemplate', $useHeadElement = true;
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ){
parent::setupSkinUserCss( $out );
$out->addModuleStyles ('skins.modern');
Modified: trunk/phase3/skins/MonoBook.php
===================================================================
--- trunk/phase3/skins/MonoBook.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/MonoBook.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -23,6 +23,9 @@
var $skinname = 'monobook', $stylename = 'monobook',
$template = 'MonoBookTemplate', $useHeadElement = true;
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ) {
global $wgHandheldStyle;
parent::setupSkinUserCss( $out );
@@ -211,6 +214,8 @@
/**
* Prints the cactions bar.
* Shared between MonoBook and Modern
+ *
+ * @param $skin Skin
*/
function cactions( Skin $skin ) {
?>
Modified: trunk/phase3/skins/Nostalgia.php
===================================================================
--- trunk/phase3/skins/Nostalgia.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/Nostalgia.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -18,6 +18,9 @@
var $skinname = 'nostalgia', $stylename = 'nostalgia',
$template = 'NostalgiaTemplate';
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ){
parent::setupSkinUserCss( $out );
$out->addModuleStyles( 'skins.nostalgia' );
@@ -27,6 +30,9 @@
class NostalgiaTemplate extends LegacyTemplate {
+ /**
+ * @return string
+ */
function doBeforeContent() {
$s = "\n<div id='content'>\n<div id='top'>\n";
$s .= '<div id="logo">' . $this->getSkin()->logoText( 'right' )
. '</div>';
@@ -59,6 +65,9 @@
return $s;
}
+ /**
+ * @return string
+ */
function topLinks() {
global $wgOut, $wgUser;
$sep = " |\n";
@@ -105,6 +114,9 @@
return $s;
}
+ /**
+ * @return string
+ */
function doAfterContent() {
$s = "\n</div><br clear='all' />\n";
Modified: trunk/phase3/skins/Simple.php
===================================================================
--- trunk/phase3/skins/Simple.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/Simple.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -21,6 +21,9 @@
var $skinname = 'simple', $stylename = 'simple',
$template = 'MonoBookTemplate', $useHeadElement = true;
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss( $out );
Modified: trunk/phase3/skins/Standard.php
===================================================================
--- trunk/phase3/skins/Standard.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/Standard.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -18,6 +18,9 @@
var $skinname = 'standard', $stylename = 'standard',
$template = 'StandardTemplate';
+ /**
+ * @param $out OutputPage
+ */
function setupSkinUserCss( OutputPage $out ){
parent::setupSkinUserCss( $out );
$out->AddModuleStyles( 'skins.standard' );
@@ -51,6 +54,9 @@
class StandardTemplate extends LegacyTemplate {
+ /**
+ * @return string
+ */
function doAfterContent() {
global $wgContLang, $wgLang;
wfProfileIn( __METHOD__ );
@@ -99,6 +105,9 @@
return $s;
}
+ /**
+ * @return string
+ */
function quickBar() {
global $wgOut, $wgUser, $wgRequest, $wgContLang;
Modified: trunk/phase3/skins/Vector.php
===================================================================
--- trunk/phase3/skins/Vector.php 2011-05-29 18:00:59 UTC (rev 89122)
+++ trunk/phase3/skins/Vector.php 2011-05-29 18:32:30 UTC (rev 89123)
@@ -108,7 +108,7 @@
}
if ( isset( $link['tooltiponly'] ) &&
$link['tooltiponly'] ) {
$nav[$section][$key]['key'] =
- Linker::tooltip( $xmlID );
+ Linker::titleAttrib( $xmlID );
} else {
$nav[$section][$key]['key'] =
Xml::expandAttributes(
Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
@@ -258,6 +258,8 @@
/**
* Render a series of portals
+ *
+ * @params $portals array
*/
private function renderPortals( $portals ) {
// Force the rendering of the following portals
@@ -297,7 +299,7 @@
$msg = $name;
}
?>
-<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php
echo Linker::tooltip( 'p-' . $name ) ?>>
+<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php
echo Linker::titleAttrib( 'p-' . $name ) ?>>
<h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj =
wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() :
$msg ); ?></h5>
<div class="body">
<?php
@@ -327,6 +329,8 @@
/**
* Render one or more navigations elements by name, automatically
reveresed
* when UI is in RTL mode
+ *
+ * @param $elements array
*/
private function renderNavigation( $elements ) {
global $wgVectorUseSimpleSearch, $wgVectorShowVariantName,
$wgUser;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
