http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96187
Revision: 96187
Author: siebrand
Date: 2011-09-03 14:27:01 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
User Linker class statically and update interfaces.
Put multiple globals on one line.
Modified Paths:
--------------
trunk/extensions/Collection/Collection.body.php
trunk/extensions/Collection/Collection.hooks.php
trunk/extensions/Collection/Collection.php
Modified: trunk/extensions/Collection/Collection.body.php
===================================================================
--- trunk/extensions/Collection/Collection.body.php 2011-09-03 14:06:27 UTC
(rev 96186)
+++ trunk/extensions/Collection/Collection.body.php 2011-09-03 14:27:01 UTC
(rev 96187)
@@ -1,5 +1,4 @@
<?php
-
/*
* Collection Extension for MediaWiki
*
@@ -39,11 +38,7 @@
}
function execute( $par ) {
- global $wgOut;
- global $wgRequest;
- global $wgUser;
- global $wgContLang;
- global $wgCollectionMaxArticles;
+ global $wgOut, $wgRequest, $wgUser, $wgContLang,
$wgCollectionMaxArticles;
// support previous URLs (e.g. used in templates) which used
the "$par" part
// (i.e. subpages of the Special page)
@@ -305,9 +300,7 @@
}
function renderBookCreatorPage( $referer, $par ) {
- global $wgOut;
- global $wgUser;
- global $wgJsMimeType;
+ global $wgOut, $wgJsMimeType;
$this->setHeaders();
$wgOut->setPageTitle( wfMsg( 'coll-book_creator' ) );
@@ -327,7 +320,6 @@
if ( is_null( $title ) || $title->equals( $this->getTitle( $par
) ) ) {
$title = Title::newMainPage();
}
- $sk = $wgUser->getSkin();
$wgOut->addHTML(
Xml::tags( 'div',
@@ -356,7 +348,7 @@
array(
'class' => 'collection-button
cancel',
),
- $sk->link(
+ Linker::link(
$title,
wfMsgHtml( 'coll-cancel' ),
array(
@@ -430,8 +422,7 @@
}
static function getBookPagePrefixes() {
- global $wgUser;
- global $wgCommunityCollectionNamespace;
+ global $wgUser, $wgCommunityCollectionNamespace;
$result = array();
@@ -458,8 +449,7 @@
}
function renderSpecialPage() {
- global $wgCollectionFormats;
- global $wgOut;
+ global $wgCollectionFormats, $wgOut;
if ( !CollectionSession::hasSession() ) {
CollectionSession::startSession();
@@ -619,8 +609,7 @@
}
static function addCategory( $title ) {
- global $wgCollectionMaxArticles;
- global $wgCollectionArticleNamespaces;
+ global $wgCollectionMaxArticles, $wgCollectionArticleNamespaces;
$limit = $wgCollectionMaxArticles -
CollectionSession::countArticles();
if ( $limit <= 0 ) {
@@ -876,12 +865,8 @@
}
function getLicenseInfos() {
- global $wgCollectionLicenseName;
- global $wgCollectionLicenseURL;
- global $wgRightsIcon;
- global $wgRightsPage;
- global $wgRightsText;
- global $wgRightsUrl;
+ global $wgCollectionLicenseName, $wgCollectionLicenseURL,
$wgRightsIcon;
+ global $wgRightsPage, $wgRightsText, $wgRightsUrl;
$licenseInfo = array(
"type" => "license",
@@ -1082,9 +1067,7 @@
}
function download() {
- global $wgOut;
- global $wgRequest;
- global $wgCollectionContentTypeToFilename;
+ global $wgOut, $wgRequest, $wgCollectionContentTypeToFilename;
$tempfile = tmpfile();
$r = self::mwServeCommand( 'render_status', array(
@@ -1210,10 +1193,7 @@
}
static function mwServeCommand( $command, $args ) {
- global $wgOut;
- global $wgCollectionMWServeURL;
- global $wgCollectionMWServeCredentials;
- global $wgCollectionFormatToServeURL;
+ global $wgOut, $wgCollectionMWServeURL,
$wgCollectionMWServeCredentials, $wgCollectionFormatToServeURL;
$serveURL = $wgCollectionMWServeURL;
if ( array_key_exists( $args['writer'],
$wgCollectionFormatToServeURL ) )
Modified: trunk/extensions/Collection/Collection.hooks.php
===================================================================
--- trunk/extensions/Collection/Collection.hooks.php 2011-09-03 14:06:27 UTC
(rev 96186)
+++ trunk/extensions/Collection/Collection.hooks.php 2011-09-03 14:27:01 UTC
(rev 96187)
@@ -1,5 +1,4 @@
<?php
-
/*
* Collection Extension for MediaWiki
*
@@ -97,7 +96,7 @@
if ( !CollectionSession::isEnabled() ) {
$out .= Xml::tags( 'li',
array( 'id' => 'coll-create_a_book' ),
- $sk->link(
+ Linker::link(
SpecialPage::getTitleFor( 'Book' ),
wfMsgHtml( 'coll-create_a_book' ),
array(
@@ -111,7 +110,7 @@
} else {
$out .= Xml::tags( 'li',
array( 'id' => 'coll-book_creator_disable' ),
- $sk->link(
+ Linker::link(
SpecialPage::getTitleFor( 'Book' ),
wfMsgHtml( 'coll-book_creator_disable'
),
array(
@@ -140,7 +139,7 @@
$params['writer'] = $writer;
$out .= Xml::tags( 'li',
array( 'id' => 'coll-download-as-' . $writer ),
- $sk->link(
+ Linker::link(
SpecialPage::getTitleFor( 'Book' ),
wfMsgHtml( 'coll-download_as',
htmlspecialchars( $wgCollectionFormats[$writer] ) ),
array(
@@ -200,17 +199,16 @@
if ( $skin ) {
$title = $skin->getTitle();
} else {
- global $wgTitle, $wgUser;
+ global $wgTitle;
$title = $wgTitle;
- $skin = $wgUser->getSkin();
}
if ( $title->isSpecial( 'Book' ) ) {
$cmd = $wgRequest->getVal( 'bookcmd', '' );
if ( $cmd == 'suggest' ) {
- $siteNotice .= self::renderBookCreatorBox(
$title, $skin, 'suggest' );
+ $siteNotice .= self::renderBookCreatorBox(
$title, 'suggest' );
} elseif ( $cmd == '' ) {
- $siteNotice .= self::renderBookCreatorBox(
$title, $skin, 'showbook' );
+ $siteNotice .= self::renderBookCreatorBox(
$title, 'showbook' );
}
return true;
}
@@ -225,7 +223,7 @@
return true;
}
- $siteNotice .= self::renderBookCreatorBox( $title, $skin );
+ $siteNotice .= self::renderBookCreatorBox( $title );
return true;
}
@@ -235,7 +233,7 @@
* @param $mode string
* @return string
*/
- static function renderBookCreatorBox( $title, $skin, $mode = '' ) {
+ static function renderBookCreatorBox( $title, $mode = '' ) {
global $wgCollectionStyleVersion;
global $wgOut;
global $wgScriptPath;
@@ -273,7 +271,7 @@
array( 'class' => 'collection-creatorbox-row' ),
Xml::tags( 'div',
array( 'class' => 'mw-float-end' ),
- $skin->link(
+ Linker::link(
Title::newFromText( wfMsg(
'coll-helppage' ) ),
Xml::element( 'img',
array(
@@ -298,7 +296,7 @@
wfMsgHtml( 'coll-book_creator' )
)
. ' ('
- . $skin->link(
+ . Linker::link(
SpecialPage::getTitleFor( 'Book' ),
wfMsgHtml( 'coll-disable' ),
array(
@@ -316,21 +314,21 @@
'id' => 'coll-book_creator_box',
'class' => 'collection-creatorbox-row',
),
- self::getBookCreatorBoxContent( $skin, $title,
$addRemoveState, $oldid )
+ self::getBookCreatorBoxContent( $title,
$addRemoveState, $oldid )
);
$html .= Xml::closeElement( 'div' );
return $html;
}
- static function getBookCreatorBoxContent( $skin, $title, $ajaxHint =
null, $oldid = null ) {
+ static function getBookCreatorBoxContent( $title, $ajaxHint = null,
$oldid = null ) {
global $wgScriptPath;
$imagePath = "$wgScriptPath/extensions/Collection/images";
- return self::getBookCreatorBoxAddRemoveLink( $skin, $imagePath,
$ajaxHint, $title, $oldid )
- . self::getBookCreatorBoxShowBookLink( $skin,
$imagePath, $ajaxHint )
- . self::getBookCreatorBoxSuggestLink( $skin,
$imagePath, $ajaxHint );
+ return self::getBookCreatorBoxAddRemoveLink( $imagePath,
$ajaxHint, $title, $oldid )
+ . self::getBookCreatorBoxShowBookLink( $imagePath,
$ajaxHint )
+ . self::getBookCreatorBoxSuggestLink( $imagePath,
$ajaxHint );
}
/**
@@ -341,7 +339,7 @@
* @param $oldid
* @return string
*/
- static function getBookCreatorBoxAddRemoveLink( $sk, $imagePath,
$ajaxHint, $title, $oldid ) {
+ static function getBookCreatorBoxAddRemoveLink( $imagePath, $ajaxHint,
$title, $oldid ) {
$namespace = $title->getNamespace();
$ptext = $title->getPrefixedText();
@@ -389,7 +387,7 @@
}
}
- return $sk->link(
+ return Linker::link(
SpecialPage::getTitleFor( 'Book' ),
Xml::element( 'img',
array(
@@ -412,8 +410,9 @@
}
- static function getBookCreatorBoxShowBookLink( $sk, $imagePath,
$ajaxHint ) {
+ static function getBookCreatorBoxShowBookLink( $imagePath, $ajaxHint ) {
$numArticles = CollectionSession::countArticles();
+
if ( $ajaxHint == 'showbook' ) {
return Xml::tags( 'strong',
array(
@@ -431,7 +430,7 @@
. ' (' . wfMsgExt( 'coll-n_pages', array(
'parsemag', 'escape' ), $numArticles ) . ')'
);
} else {
- return $sk->link(
+ return Linker::link(
SpecialPage::getTitleFor( 'Book' ),
Xml::element( 'img',
array(
@@ -454,7 +453,7 @@
}
}
- static function getBookCreatorBoxSuggestLink( $sk, $imagePath,
$ajaxHint ) {
+ static function getBookCreatorBoxSuggestLink( $imagePath, $ajaxHint ) {
if ( wfMsg( 'coll-suggest_enabled' ) != '1' ) {
return '';
}
@@ -476,7 +475,7 @@
. ' ' . wfMsgHtml( 'coll-make_suggestions'
)
);
} else {
- return $sk->link(
+ return Linker::link(
SpecialPage::getTitleFor( 'Book' ),
Xml::element( 'img',
array(
@@ -517,4 +516,3 @@
return true;
}
}
-
Modified: trunk/extensions/Collection/Collection.php
===================================================================
--- trunk/extensions/Collection/Collection.php 2011-09-03 14:06:27 UTC (rev
96186)
+++ trunk/extensions/Collection/Collection.php 2011-09-03 14:27:01 UTC (rev
96187)
@@ -268,8 +268,6 @@
$wgAjaxExportList[] = 'wfAjaxCollectionAddCategory';
function wfAjaxCollectionGetBookCreatorBoxContent( $ajaxHint = '', $oldid =
null, $pageName = null ) {
- global $wgUser;
-
if ( !is_null( $oldid ) ) {
$oldid = intval( $oldid );
}
@@ -282,7 +280,7 @@
$title = Title::newMainPage();
}
- $html = CollectionHooks::getBookCreatorBoxContent( $wgUser->getSkin(),
$title, $ajaxHint, $oldid );
+ $html = CollectionHooks::getBookCreatorBoxContent( $title, $ajaxHint,
$oldid );
$json = new Services_JSON();
$result = array();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
