Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3240
skin.diff
Public
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
•
bzimport
Nov 21 2014, 9:25 PM
2014-11-21 21:25:03 (UTC+0)
Size
2 KB
Referenced Files
None
Subscribers
None
skin.diff
View Options
Index: includes/Skin.php
===================================================================
--- includes/Skin.php (revision 16536)
+++ includes/Skin.php (working copy)
@@ -269,7 +269,7 @@
$out->out( "\n</body></html>" );
}
- /*static*/ function makeGlobalVariablesScript( $data ) {
+ static function makeGlobalVariablesScript( $data ) {
$r = '<script type= "' . $data['jsmimetype'] . '">
var skin = "' . Xml::escapeJsString( $data['skinname'] ) . '";
var stylepath = "' . Xml::escapeJsString( $data['stylepath'] ) . '";
@@ -1436,44 +1436,44 @@
}
/* these are used extensively in SkinTemplate, but also some other places */
- /*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
+ static function makeSpecialUrl( $name, $urlaction='' ) {
$title = Title::makeTitle( NS_SPECIAL, $name );
return $title->getLocalURL( $urlaction );
}
- /*static*/ function makeI18nUrl ( $name, $urlaction='' ) {
+ static function makeI18nUrl ( $name, $urlaction='' ) {
$title = Title::newFromText( wfMsgForContent($name) );
- $this->checkTitle($title, $name);
+ self::checkTitle($title, $name);
return $title->getLocalURL( $urlaction );
}
- /*static*/ function makeUrl ( $name, $urlaction='' ) {
+ static function makeUrl ( $name, $urlaction='' ) {
$title = Title::newFromText( $name );
- $this->checkTitle($title, $name);
+ self::checkTitle($title, $name);
return $title->getLocalURL( $urlaction );
}
# If url string starts with http, consider as external URL, else
# internal
- /*static*/ function makeInternalOrExternalUrl( $name ) {
+ static function makeInternalOrExternalUrl( $name ) {
if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $name ) ) {
return $name;
} else {
- return $this->makeUrl( $name );
+ return self::makeUrl( $name );
}
}
# this can be passed the NS number as defined in Language.php
- /*static*/ function makeNSUrl( $name, $urlaction='', $namespace=NS_MAIN ) {
+ static function makeNSUrl( $name, $urlaction='', $namespace=NS_MAIN ) {
$title = Title::makeTitleSafe( $namespace, $name );
- $this->checkTitle($title, $name);
+ self::checkTitle($title, $name);
return $title->getLocalURL( $urlaction );
}
/* these return an array with the 'href' and boolean 'exists' */
- /*static*/ function makeUrlDetails ( $name, $urlaction='' ) {
+ static function makeUrlDetails ( $name, $urlaction='' ) {
$title = Title::newFromText( $name );
- $this->checkTitle($title, $name);
+ self::checkTitle($title, $name);
return array(
'href' => $title->getLocalURL( $urlaction ),
'exists' => $title->getArticleID() != 0?true:false
@@ -1493,7 +1493,7 @@
}
# make sure we have some title to operate on
- /*static*/ function checkTitle ( &$title, &$name ) {
+ static function checkTitle ( &$title, &$name ) {
if(!is_object($title)) {
$title = Title::newFromText( $name );
if(!is_object($title)) {
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2809
Default Alt Text
skin.diff (2 KB)
Attached To
Mode
T9357: Make supposedly static methods of Skin actually static
Attached
Detach File
Event Timeline
Log In to Comment