summaryrefslogtreecommitdiff
path: root/includes/SkinTemplate.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2010-07-28 11:52:48 +0200
committerPierre Schmitz <pierre@archlinux.de>2010-07-28 11:52:48 +0200
commit222b01f5169f1c7e69762e0e8904c24f78f71882 (patch)
tree8e932e12546bb991357ec48eb1638d1770be7a35 /includes/SkinTemplate.php
parent00ab76a6b686e98a914afc1975812d2b1aaa7016 (diff)
update to MediaWiki 1.16.0
Diffstat (limited to 'includes/SkinTemplate.php')
-rw-r--r--includes/SkinTemplate.php593
1 files changed, 328 insertions, 265 deletions
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 4317a93e..e5fdb274 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -27,11 +27,11 @@ if ( ! defined( 'MEDIAWIKI' ) )
class MediaWiki_I18N {
var $_context = array();
- function set($varName, $value) {
+ function set( $varName, $value ) {
$this->_context[$varName] = $value;
}
- function translate($value) {
+ function translate( $value ) {
wfProfileIn( __METHOD__ );
// Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
@@ -40,12 +40,12 @@ class MediaWiki_I18N {
$value = wfMsg( $value );
// interpolate variables
$m = array();
- while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
- list($src, $var) = $m;
+ while( preg_match( '/\$([0-9]*?)/sm', $value, $m ) ) {
+ list( $src, $var ) = $m;
wfSuppressWarnings();
$varValue = $this->_context[$var];
wfRestoreWarnings();
- $value = str_replace($src, $varValue, $value);
+ $value = str_replace( $src, $varValue, $value );
}
wfProfileOut( __METHOD__ );
return $value;
@@ -70,38 +70,30 @@ class SkinTemplate extends Skin {
*/
/**
- * Name of our skin, set in initPage()
- * It probably need to be all lower case.
+ * Name of our skin, it probably needs to be all lower case. Child classes
+ * should override the default.
*/
- var $skinname;
+ var $skinname = 'monobook';
/**
- * Stylesheets set to use
- * Sub directory in ./skins/ where various stylesheets are located
+ * Stylesheets set to use. Subdirectory in skins/ where various stylesheets
+ * are located. Child classes should override the default.
*/
- var $stylename;
+ var $stylename = 'monobook';
/**
- * For QuickTemplate, the name of the subclass which
- * will actually fill the template.
+ * For QuickTemplate, the name of the subclass which will actually fill the
+ * template. Child classes should override the default.
*/
- var $template;
-
- /**#@-*/
+ var $template = 'QuickTemplate';
/**
- * Setup the base parameters...
- * Child classes should override this to set the name,
- * style subdirectory, and template filler callback.
- *
- * @param $out OutputPage
+ * Whether this skin use OutputPage::headElement() to generate the <head>
+ * tag
*/
- function initPage( OutputPage $out ) {
- parent::initPage( $out );
- $this->skinname = 'monobook';
- $this->stylename = 'monobook';
- $this->template = 'QuickTemplate';
- }
+ var $useHeadElement = false;
+
+ /**#@-*/
/**
* Add specific styles for this skin
@@ -110,7 +102,7 @@ class SkinTemplate extends Skin {
*/
function setupSkinUserCss( OutputPage $out ){
$out->addStyle( 'common/shared.css', 'screen' );
- $out->addStyle( 'common/commonPrint.css', 'print' );
+ $out->addStyle( 'common/commonPrint.css', 'print' );
}
/**
@@ -124,7 +116,7 @@ class SkinTemplate extends Skin {
* @return object
* @private
*/
- function setupTemplate( $classname, $repository=false, $cache_dir=false ) {
+ function setupTemplate( $classname, $repository = false, $cache_dir = false ) {
return new $classname();
}
@@ -134,15 +126,15 @@ class SkinTemplate extends Skin {
* @param $out OutputPage
*/
function outputPage( OutputPage $out ) {
- global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang;
+ global $wgArticle, $wgUser, $wgLang, $wgContLang;
global $wgScript, $wgStylePath, $wgContLanguageCode;
global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
- global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
+ global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version;
global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
global $wgMaxCredits, $wgShowCreditsIfMax;
global $wgPageShowWatchingUsers;
- global $wgUseTrackbacks, $wgUseSiteJs;
- global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
+ global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments;
+ global $wgArticlePath, $wgScriptPath, $wgServer;
wfProfileIn( __METHOD__ );
@@ -150,23 +142,31 @@ class SkinTemplate extends Skin {
$diff = $wgRequest->getVal( 'diff' );
$action = $wgRequest->getVal( 'action', 'view' );
- wfProfileIn( __METHOD__."-init" );
+ wfProfileIn( __METHOD__ . '-init' );
$this->initPage( $out );
$this->setMembers();
$tpl = $this->setupTemplate( $this->template, 'skins' );
#if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
- $tpl->setTranslator(new MediaWiki_I18N());
+ $tpl->setTranslator( new MediaWiki_I18N() );
#}
- wfProfileOut( __METHOD__."-init" );
+ wfProfileOut( __METHOD__ . '-init' );
- wfProfileIn( __METHOD__."-stuff" );
- $this->thispage = $this->mTitle->getPrefixedDbKey();
+ wfProfileIn( __METHOD__ . '-stuff' );
+ $this->thispage = $this->mTitle->getPrefixedDBkey();
$this->thisurl = $this->mTitle->getPrefixedURL();
+ $query = array();
+ if ( !$wgRequest->wasPosted() ) {
+ $query = $wgRequest->getValues();
+ unset( $query['title'] );
+ unset( $query['returnto'] );
+ unset( $query['returntoquery'] );
+ }
+ $this->thisquery = wfUrlencode( wfArrayToCGI( $query ) );
$this->loggedin = $wgUser->isLoggedIn();
- $this->iscontent = ($this->mTitle->getNamespace() != NS_SPECIAL );
- $this->iseditable = ($this->iscontent and !($action == 'edit' or $action == 'submit'));
+ $this->iscontent = ( $this->mTitle->getNamespace() != NS_SPECIAL );
+ $this->iseditable = ( $this->iscontent and !( $action == 'edit' or $action == 'submit' ) );
$this->username = $wgUser->getName();
if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
@@ -177,22 +177,59 @@ class SkinTemplate extends Skin {
$this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
}
- $this->userjs = $this->userjsprev = false;
- $this->setupUserCss( $out );
- $this->setupUserJs( $out->isUserJsAllowed() );
$this->titletxt = $this->mTitle->getPrefixedText();
- wfProfileOut( __METHOD__."-stuff" );
+ wfProfileOut( __METHOD__ . '-stuff' );
- wfProfileIn( __METHOD__."-stuff2" );
+ wfProfileIn( __METHOD__ . '-stuff-head' );
+ if ( $this->useHeadElement ) {
+ $pagecss = $this->setupPageCss();
+ if( $pagecss )
+ $out->addInlineStyle( $pagecss );
+ } else {
+ $this->setupUserCss( $out );
+
+ $tpl->set( 'pagecss', $this->setupPageCss() );
+ $tpl->setRef( 'usercss', $this->usercss );
+
+ $this->userjs = $this->userjsprev = false;
+ $this->setupUserJs( $out->isUserJsAllowed() );
+ $tpl->setRef( 'userjs', $this->userjs );
+ $tpl->setRef( 'userjsprev', $this->userjsprev );
+
+ if( $wgUseSiteJs ) {
+ $jsCache = $this->loggedin ? '&smaxage=0' : '';
+ $tpl->set( 'jsvarurl',
+ self::makeUrl( '-',
+ "action=raw$jsCache&gen=js&useskin=" .
+ urlencode( $this->getSkinName() ) ) );
+ } else {
+ $tpl->set( 'jsvarurl', false );
+ }
+
+ $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
+ $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
+ $tpl->set( 'html5version', $wgHtml5Version );
+ $tpl->set( 'headlinks', $out->getHeadLinks() );
+ $tpl->set( 'csslinks', $out->buildCssLinks() );
+
+ if( $wgUseTrackbacks && $out->isArticleRelated() ) {
+ $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() );
+ } else {
+ $tpl->set( 'trackbackhtml', null );
+ }
+ }
+ wfProfileOut( __METHOD__ . '-stuff-head' );
+
+ wfProfileIn( __METHOD__ . '-stuff2' );
$tpl->set( 'title', $out->getPageTitle() );
$tpl->set( 'pagetitle', $out->getHTMLTitle() );
$tpl->set( 'displaytitle', $out->mPageLinkTitle );
$tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) );
- $tpl->set( 'skinnameclass', ( "skin-" . Sanitizer::escapeClass( $this->getSkinName ( ) ) ) );
+ $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) );
- $nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
- $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
- $this->mTitle->getNsText();
+ $nsname = MWNamespace::exists( $this->mTitle->getNamespace() ) ?
+ MWNamespace::getCanonicalName( $this->mTitle->getNamespace() ) :
+ $this->mTitle->getNsText();
$tpl->set( 'nscanonical', $nsname );
$tpl->set( 'nsnumber', $this->mTitle->getNamespace() );
@@ -203,54 +240,45 @@ class SkinTemplate extends Skin {
$tpl->set( 'isarticle', $out->isArticle() );
- $tpl->setRef( "thispage", $this->thispage );
+ $tpl->setRef( 'thispage', $this->thispage );
$subpagestr = $this->subPageSubtitle();
$tpl->set(
- 'subtitle', !empty($subpagestr)?
- '<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle():
+ 'subtitle', !empty( $subpagestr ) ?
+ '<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle() :
$out->getSubtitle()
);
$undelete = $this->getUndeleteLink();
$tpl->set(
- "undelete", !empty($undelete)?
- '<span class="subpages">'.$undelete.'</span>':
+ 'undelete', !empty( $undelete ) ?
+ '<span class="subpages">'.$undelete.'</span>' :
''
);
- $tpl->set( 'catlinks', $this->getCategories());
+ $tpl->set( 'catlinks', $this->getCategories() );
if( $out->isSyndicated() ) {
$feeds = array();
foreach( $out->getSyndicationLinks() as $format => $link ) {
$feeds[$format] = array(
'text' => wfMsg( "feed-$format" ),
- 'href' => $link );
+ 'href' => $link
+ );
}
$tpl->setRef( 'feeds', $feeds );
} else {
$tpl->set( 'feeds', false );
}
- if ($wgUseTrackbacks && $out->isArticleRelated()) {
- $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF() );
- } else {
- $tpl->set( 'trackbackhtml', null );
- }
- $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
- $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
$tpl->setRef( 'mimetype', $wgMimeType );
$tpl->setRef( 'jsmimetype', $wgJsMimeType );
$tpl->setRef( 'charset', $wgOutputEncoding );
- $tpl->set( 'headlinks', $out->getHeadLinks() );
- $tpl->set( 'headscripts', $out->getScript() );
- $tpl->set( 'csslinks', $out->buildCssLinks() );
$tpl->setRef( 'wgScript', $wgScript );
$tpl->setRef( 'skinname', $this->skinname );
$tpl->set( 'skinclass', get_class( $this ) );
$tpl->setRef( 'stylename', $this->stylename );
- $tpl->set( 'printable', $wgRequest->getBool( 'printable' ) );
+ $tpl->set( 'printable', $out->isPrintable() );
$tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) );
$tpl->setRef( 'loggedin', $this->loggedin );
- $tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL);
+ $tpl->set( 'notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL );
/* XXX currently unused, might get useful later
$tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
$tpl->set( "exists", $this->mTitle->getArticleID() != 0 );
@@ -259,111 +287,130 @@ class SkinTemplate extends Skin {
$tpl->set( "helppage", wfMsg('helppage'));
*/
$tpl->set( 'searchaction', $this->escapeSearchLink() );
- $tpl->set( 'searchtitle', SpecialPage::getTitleFor('search')->getPrefixedDBKey() );
+ $tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBKey() );
$tpl->set( 'search', trim( $wgRequest->getVal( 'search' ) ) );
$tpl->setRef( 'stylepath', $wgStylePath );
$tpl->setRef( 'articlepath', $wgArticlePath );
$tpl->setRef( 'scriptpath', $wgScriptPath );
$tpl->setRef( 'serverurl', $wgServer );
$tpl->setRef( 'logopath', $wgLogo );
- $tpl->setRef( "lang", $wgContLanguageCode );
- $tpl->set( 'dir', $wgContLang->isRTL() ? "rtl" : "ltr" );
+ $tpl->setRef( 'lang', $wgContLanguageCode );
+ $tpl->set( 'dir', $wgContLang->getDir() );
$tpl->set( 'rtl', $wgContLang->isRTL() );
+ $tpl->set( 'capitalizeallnouns', $wgLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
$tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) );
$tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) );
- $tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username );
- $tpl->setRef( 'userpage', $this->userpage);
- $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
+ $tpl->set( 'username', $wgUser->isAnon() ? null : $this->username );
+ $tpl->setRef( 'userpage', $this->userpage );
+ $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
$tpl->set( 'userlang', $wgLang->getCode() );
- $tpl->set( 'pagecss', $this->setupPageCss() );
- $tpl->setRef( 'usercss', $this->usercss);
- $tpl->setRef( 'userjs', $this->userjs);
- $tpl->setRef( 'userjsprev', $this->userjsprev);
- if( $wgUseSiteJs ) {
- $jsCache = $this->loggedin ? '&smaxage=0' : '';
- $tpl->set( 'jsvarurl',
- self::makeUrl('-',
- "action=raw$jsCache&gen=js&useskin=" .
- urlencode( $this->getSkinName() ) ) );
- } else {
- $tpl->set('jsvarurl', false);
+
+ // Users can have their language set differently than the
+ // content of the wiki. For these users, tell the web browser
+ // that interface elements are in a different language.
+ $tpl->set( 'userlangattributes', '');
+ $tpl->set( 'specialpageattributes', '');
+
+ $lang = $wgLang->getCode();
+ $dir = $wgLang->getDir();
+ if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
+ $attrs = " lang='$lang' dir='$dir'";
+
+ $tpl->set( 'userlangattributes', $attrs );
+
+ // The content of SpecialPages should be presented in the
+ // user's language. Content of regular pages should not be touched.
+ if($this->mTitle->isSpecialPage()) {
+ $tpl->set( 'specialpageattributes', $attrs );
+ }
}
+
$newtalks = $wgUser->getNewMessageLinks();
+ $ntl = '';
- if (count($newtalks) == 1 && $newtalks[0]["wiki"] === wfWikiID() ) {
+ if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
$usertitle = $this->mUser->getUserPage();
$usertalktitle = $usertitle->getTalkPage();
+
if( !$usertalktitle->equals( $this->mTitle ) ) {
- $ntl = wfMsg( 'youhavenewmessages',
- $this->makeKnownLinkObj(
- $usertalktitle,
- wfMsgHtml( 'newmessageslink' ),
- 'redirect=no'
- ),
- $this->makeKnownLinkObj(
- $usertalktitle,
- wfMsgHtml( 'newmessagesdifflink' ),
- 'diff=cur'
- )
+ $newmessageslink = $this->link(
+ $usertalktitle,
+ wfMsgHtml( 'newmessageslink' ),
+ array(),
+ array( 'redirect' => 'no' ),
+ array( 'known', 'noclasses' )
+ );
+
+ $newmessagesdifflink = $this->link(
+ $usertalktitle,
+ wfMsgHtml( 'newmessagesdifflink' ),
+ array(),
+ array( 'diff' => 'cur' ),
+ array( 'known', 'noclasses' )
+ );
+
+ $ntl = wfMsg(
+ 'youhavenewmessages',
+ $newmessageslink,
+ $newmessagesdifflink
);
# Disable Cache
- $out->setSquidMaxage(0);
+ $out->setSquidMaxage( 0 );
}
- } else if (count($newtalks)) {
- $sep = str_replace("_", " ", wfMsgHtml("newtalkseparator"));
+ } else if( count( $newtalks ) ) {
+ // _>" " for BC <= 1.16
+ $sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
$msgs = array();
- foreach ($newtalks as $newtalk) {
- $msgs[] = Xml::element("a",
- array('href' => $newtalk["link"]), $newtalk["wiki"]);
+ foreach( $newtalks as $newtalk ) {
+ $msgs[] = Xml::element('a',
+ array( 'href' => $newtalk['link'] ), $newtalk['wiki'] );
}
- $parts = implode($sep, $msgs);
- $ntl = wfMsgHtml('youhavenewmessagesmulti', $parts);
- $out->setSquidMaxage(0);
- } else {
- $ntl = '';
+ $parts = implode( $sep, $msgs );
+ $ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
+ $out->setSquidMaxage( 0 );
}
- wfProfileOut( __METHOD__."-stuff2" );
+ wfProfileOut( __METHOD__ . '-stuff2' );
- wfProfileIn( __METHOD__."-stuff3" );
+ wfProfileIn( __METHOD__ . '-stuff3' );
$tpl->setRef( 'newtalk', $ntl );
$tpl->setRef( 'skin', $this );
$tpl->set( 'logo', $this->logoText() );
- if ( $out->isArticle() and (!isset( $oldid ) or isset( $diff )) and
- $wgArticle and 0 != $wgArticle->getID() )
- {
+ if ( $out->isArticle() and ( !isset( $oldid ) or isset( $diff ) ) and
+ $wgArticle and 0 != $wgArticle->getID() ){
if ( !$wgDisableCounters ) {
$viewcount = $wgLang->formatNum( $wgArticle->getCount() );
if ( $viewcount ) {
- $tpl->set('viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
+ $tpl->set( 'viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
} else {
- $tpl->set('viewcount', false);
+ $tpl->set( 'viewcount', false );
}
} else {
- $tpl->set('viewcount', false);
+ $tpl->set( 'viewcount', false );
}
- if ($wgPageShowWatchingUsers) {
+ if( $wgPageShowWatchingUsers ) {
$dbr = wfGetDB( DB_SLAVE );
$watchlist = $dbr->tableName( 'watchlist' );
- $sql = "SELECT COUNT(*) AS n FROM $watchlist
- WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBkey()) .
- "' AND wl_namespace=" . $this->mTitle->getNamespace() ;
- $res = $dbr->query( $sql, 'SkinTemplate::outputPage');
+ $res = $dbr->select( 'watchlist',
+ array( 'COUNT(*) AS n' ),
+ array( 'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ), 'wl_namespace' => $this->mTitle->getNamespace() ),
+ __METHOD__
+ );
$x = $dbr->fetchObject( $res );
$numberofwatchingusers = $x->n;
- if ($numberofwatchingusers > 0) {
- $tpl->set('numberofwatchingusers',
- wfMsgExt('number_of_watching_users_pageview', array('parseinline'),
- $wgLang->formatNum($numberofwatchingusers))
+ if( $numberofwatchingusers > 0 ) {
+ $tpl->set( 'numberofwatchingusers',
+ wfMsgExt( 'number_of_watching_users_pageview', array( 'parseinline' ),
+ $wgLang->formatNum( $numberofwatchingusers ) )
);
} else {
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'numberofwatchingusers', false );
}
} else {
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'numberofwatchingusers', false );
}
- $tpl->set('copyright',$this->getCopyright());
+ $tpl->set( 'copyright', $this->getCopyright() );
$this->credits = false;
@@ -376,28 +423,33 @@ class SkinTemplate extends Skin {
$tpl->setRef( 'credits', $this->credits );
} elseif ( isset( $oldid ) && !isset( $diff ) ) {
- $tpl->set('copyright', $this->getCopyright());
- $tpl->set('viewcount', false);
- $tpl->set('lastmod', false);
- $tpl->set('credits', false);
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'copyright', $this->getCopyright() );
+ $tpl->set( 'viewcount', false );
+ $tpl->set( 'lastmod', false );
+ $tpl->set( 'credits', false );
+ $tpl->set( 'numberofwatchingusers', false );
} else {
- $tpl->set('copyright', false);
- $tpl->set('viewcount', false);
- $tpl->set('lastmod', false);
- $tpl->set('credits', false);
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'copyright', false );
+ $tpl->set( 'viewcount', false );
+ $tpl->set( 'lastmod', false );
+ $tpl->set( 'credits', false );
+ $tpl->set( 'numberofwatchingusers', false );
}
- wfProfileOut( __METHOD__."-stuff3" );
+ wfProfileOut( __METHOD__ . '-stuff3' );
- wfProfileIn( __METHOD__."-stuff4" );
+ wfProfileIn( __METHOD__ . '-stuff4' );
$tpl->set( 'copyrightico', $this->getCopyrightIcon() );
$tpl->set( 'poweredbyico', $this->getPoweredBy() );
$tpl->set( 'disclaimer', $this->disclaimerLink() );
$tpl->set( 'privacy', $this->privacyLink() );
$tpl->set( 'about', $this->aboutLink() );
- $tpl->setRef( 'debug', $out->mDebugtext );
+ if ( $wgDebugComments ) {
+ $tpl->setRef( 'debug', $out->mDebugtext );
+ } else {
+ $tpl->set( 'debug', '' );
+ }
+
$tpl->set( 'reporttime', wfReportTime() );
$tpl->set( 'sitenotice', wfGetSiteNotice() );
$tpl->set( 'bottomscripts', $this->bottomScripts() );
@@ -413,42 +465,41 @@ class SkinTemplate extends Skin {
foreach( $out->getLanguageLinks() as $l ) {
$tmp = explode( ':', $l, 2 );
$class = 'interwiki-' . $tmp[0];
- unset($tmp);
+ unset( $tmp );
$nt = Title::newFromText( $l );
if ( $nt ) {
$language_urls[] = array(
'href' => $nt->getFullURL(),
- 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
+ 'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
+ $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
'class' => $class
);
}
}
}
- if(count($language_urls)) {
- $tpl->setRef( 'language_urls', $language_urls);
+ if( count( $language_urls ) ) {
+ $tpl->setRef( 'language_urls', $language_urls );
} else {
- $tpl->set('language_urls', false);
+ $tpl->set( 'language_urls', false );
}
- wfProfileOut( __METHOD__."-stuff4" );
+ wfProfileOut( __METHOD__ . '-stuff4' );
- wfProfileIn( __METHOD__."-stuff5" );
+ wfProfileIn( __METHOD__ . '-stuff5' );
# Personal toolbar
- $tpl->set('personal_urls', $this->buildPersonalUrls());
+ $tpl->set( 'personal_urls', $this->buildPersonalUrls() );
$content_actions = $this->buildContentActionUrls();
- $tpl->setRef('content_actions', $content_actions);
+ $tpl->setRef( 'content_actions', $content_actions );
- // XXX: attach this from javascript, same with section editing
- if($this->iseditable && $wgUser->getOption("editondblclick") )
- {
- $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
- $tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
- } else {
- $tpl->set('body_ondblclick', false);
- }
- $tpl->set( 'body_onload', false );
$tpl->set( 'sidebar', $this->buildSidebar() );
$tpl->set( 'nav_urls', $this->buildNavUrls() );
+ // Set the head scripts near the end, in case the above actions resulted in added scripts
+ if ( $this->useHeadElement ) {
+ $tpl->set( 'headelement', $out->headElement( $this ) );
+ } else {
+ $tpl->set( 'headscripts', $out->getScript() );
+ }
+
// original version by hansm
if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
@@ -456,13 +507,13 @@ class SkinTemplate extends Skin {
// allow extensions adding stuff after the page content.
// See Skin::afterContentHook() for further documentation.
- $tpl->set ('dataAfterContent', $this->afterContentHook());
- wfProfileOut( __METHOD__."-stuff5" );
+ $tpl->set( 'dataAfterContent', $this->afterContentHook() );
+ wfProfileOut( __METHOD__ . '-stuff5' );
// execute template
- wfProfileIn( __METHOD__."-execute" );
+ wfProfileIn( __METHOD__ . '-execute' );
$res = $tpl->execute();
- wfProfileOut( __METHOD__."-execute" );
+ wfProfileOut( __METHOD__ . '-execute' );
// result may be an error
$this->printOrError( $res );
@@ -487,25 +538,31 @@ class SkinTemplate extends Skin {
* @private
*/
function buildPersonalUrls() {
- global $wgTitle, $wgRequest;
+ global $wgOut, $wgRequest;
- $pageurl = $wgTitle->getLocalURL();
+ $title = $wgOut->getTitle();
+ $pageurl = $title->getLocalURL();
wfProfileIn( __METHOD__ );
/* set up the default links for the personal toolbar */
$personal_urls = array();
- if ($this->loggedin) {
+ $page = $wgRequest->getVal( 'returnto', $this->thisurl );
+ $query = $wgRequest->getVal( 'returntoquery', $this->thisquery );
+ $returnto = "returnto=$page";
+ if( $this->thisquery != '' )
+ $returnto .= "&returntoquery=$query";
+ if( $this->loggedin ) {
$personal_urls['userpage'] = array(
'text' => $this->username,
'href' => &$this->userpageUrlDetails['href'],
- 'class' => $this->userpageUrlDetails['exists']?false:'new',
+ 'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $this->userpageUrlDetails['href'] == $pageurl )
);
- $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+ $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
$personal_urls['mytalk'] = array(
- 'text' => wfMsg('mytalk'),
+ 'text' => wfMsg( 'mytalk' ),
'href' => &$usertalkUrlDetails['href'],
- 'class' => $usertalkUrlDetails['exists']?false:'new',
+ 'class' => $usertalkUrlDetails['exists'] ? false : 'new',
'active' => ( $usertalkUrlDetails['href'] == $pageurl )
);
$href = self::makeSpecialUrl( 'Preferences' );
@@ -526,10 +583,10 @@ class SkinTemplate extends Skin {
# from request values or be specified in "sub page" form. The plot
# thickens, because $wgTitle is altered for special pages, so doesn't
# contain the original alias-with-subpage.
- $title = Title::newFromText( $wgRequest->getText( 'title' ) );
- if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {
+ $origTitle = Title::newFromText( $wgRequest->getText( 'title' ) );
+ if( $origTitle instanceof Title && $origTitle->getNamespace() == NS_SPECIAL ) {
list( $spName, $spPar ) =
- SpecialPage::resolveAliasWithSubpage( $title->getText() );
+ SpecialPage::resolveAliasWithSubpage( $origTitle->getText() );
$active = $spName == 'Contributions'
&& ( ( $spPar && $spPar == $this->username )
|| $wgRequest->getText( 'target' ) == $this->username );
@@ -546,7 +603,7 @@ class SkinTemplate extends Skin {
$personal_urls['logout'] = array(
'text' => wfMsg( 'userlogout' ),
'href' => self::makeSpecialUrl( 'Userlogout',
- $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
+ $title->isSpecial( 'Preferences' ) ? '' : $returnto
),
'active' => false
);
@@ -560,38 +617,37 @@ class SkinTemplate extends Skin {
$personal_urls['anonuserpage'] = array(
'text' => $this->username,
'href' => $href,
- 'class' => $this->userpageUrlDetails['exists']?false:'new',
+ 'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $pageurl == $href )
);
- $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+ $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
$href = &$usertalkUrlDetails['href'];
$personal_urls['anontalk'] = array(
- 'text' => wfMsg('anontalk'),
+ 'text' => wfMsg( 'anontalk' ),
'href' => $href,
- 'class' => $usertalkUrlDetails['exists']?false:'new',
+ 'class' => $usertalkUrlDetails['exists'] ? false : 'new',
'active' => ( $pageurl == $href )
);
$personal_urls['anonlogin'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => $wgTitle->isSpecial( 'Userlogin' )
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+ 'active' => $title->isSpecial( 'Userlogin' )
);
} else {
-
$personal_urls['login'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => $wgTitle->isSpecial( 'Userlogin' )
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+ 'active' => $title->isSpecial( 'Userlogin' )
);
}
}
- wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
+ wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
wfProfileOut( __METHOD__ );
return $personal_urls;
}
- function tabAction( $title, $message, $selected, $query='', $checkEdit=false ) {
+ function tabAction( $title, $message, $selected, $query = '', $checkEdit = false ) {
$classes = array();
if( $selected ) {
$classes[] = 'selected';
@@ -608,9 +664,9 @@ class SkinTemplate extends Skin {
}
$result = array();
- if( !wfRunHooks('SkinTemplateTabAction', array(&$this,
+ if( !wfRunHooks( 'SkinTemplateTabAction', array( &$this,
$title, $message, $selected, $checkEdit,
- &$classes, &$query, &$text, &$result)) ) {
+ &$classes, &$query, &$text, &$result ) ) ) {
return $result;
}
@@ -622,8 +678,8 @@ class SkinTemplate extends Skin {
function makeTalkUrlDetails( $name, $urlaction = '' ) {
$title = Title::newFromText( $name );
- if( !is_object($title) ) {
- throw new MWException( __METHOD__." given invalid pagename $name" );
+ if( !is_object( $title ) ) {
+ throw new MWException( __METHOD__ . " given invalid pagename $name" );
}
$title = $title->getTalkPage();
self::checkTitle( $title, $name );
@@ -649,7 +705,7 @@ class SkinTemplate extends Skin {
* @private
*/
function buildContentActionUrls() {
- global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest;
+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
wfProfileIn( __METHOD__ );
@@ -657,8 +713,8 @@ class SkinTemplate extends Skin {
$section = $wgRequest->getVal( 'section' );
$content_actions = array();
- $prevent_active_tabs = false ;
- wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this , &$prevent_active_tabs ) ) ;
+ $prevent_active_tabs = false;
+ wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$prevent_active_tabs ) );
if( $this->iscontent ) {
$subjpage = $this->mTitle->getSubjectPage();
@@ -669,32 +725,35 @@ class SkinTemplate extends Skin {
$subjpage,
$nskey,
!$this->mTitle->isTalkPage() && !$prevent_active_tabs,
- '', true);
+ '', true
+ );
$content_actions['talk'] = $this->tabAction(
$talkpage,
'talk',
$this->mTitle->isTalkPage() && !$prevent_active_tabs,
'',
- true);
+ true
+ );
- wfProfileIn( __METHOD__."-edit" );
+ wfProfileIn( __METHOD__ . '-edit' );
if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
$istalk = $this->mTitle->isTalkPage();
$istalkclass = $istalk?' istalk':'';
$content_actions['edit'] = array(
- 'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass,
+ 'class' => ( ( ( $action == 'edit' or $action == 'submit' ) and $section != 'new' ) ? 'selected' : '' ) . $istalkclass,
'text' => $this->mTitle->exists()
? wfMsg( 'edit' )
: wfMsg( 'create' ),
'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
- if ( $istalk || $wgOut->showNewSectionLink() ) {
+ // adds new section link if page is a current revision of a talk page or
+ if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) {
if ( !$wgOut->forceHideNewSectionLink() ) {
$content_actions['addsection'] = array(
'class' => $section == 'new' ? 'selected' : false,
- 'text' => wfMsg('addsection'),
+ 'text' => wfMsg( 'addsection' ),
'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
);
}
@@ -702,26 +761,26 @@ class SkinTemplate extends Skin {
} elseif ( $this->mTitle->isKnown() ) {
$content_actions['viewsource'] = array(
'class' => ($action == 'edit') ? 'selected' : false,
- 'text' => wfMsg('viewsource'),
+ 'text' => wfMsg( 'viewsource' ),
'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
}
- wfProfileOut( __METHOD__."-edit" );
+ wfProfileOut( __METHOD__ . '-edit' );
- wfProfileIn( __METHOD__."-live" );
+ wfProfileIn( __METHOD__ . '-live' );
if ( $this->mTitle->exists() ) {
$content_actions['history'] = array(
'class' => ($action == 'history') ? 'selected' : false,
- 'text' => wfMsg('history_short'),
+ 'text' => wfMsg( 'history_short' ),
'href' => $this->mTitle->getLocalUrl( 'action=history' ),
'rel' => 'archives',
);
- if( $wgUser->isAllowed('delete') ) {
+ if( $wgUser->isAllowed( 'delete' ) ) {
$content_actions['delete'] = array(
'class' => ($action == 'delete') ? 'selected' : false,
- 'text' => wfMsg('delete'),
+ 'text' => wfMsg( 'delete' ),
'href' => $this->mTitle->getLocalUrl( 'action=delete' )
);
}
@@ -729,7 +788,7 @@ class SkinTemplate extends Skin {
$moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
$content_actions['move'] = array(
'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
- 'text' => wfMsg('move'),
+ 'text' => wfMsg( 'move' ),
'href' => $moveTitle->getLocalUrl()
);
}
@@ -738,26 +797,26 @@ class SkinTemplate extends Skin {
if( !$this->mTitle->isProtected() ){
$content_actions['protect'] = array(
'class' => ($action == 'protect') ? 'selected' : false,
- 'text' => wfMsg('protect'),
+ 'text' => wfMsg( 'protect' ),
'href' => $this->mTitle->getLocalUrl( 'action=protect' )
);
} else {
$content_actions['unprotect'] = array(
'class' => ($action == 'unprotect') ? 'selected' : false,
- 'text' => wfMsg('unprotect'),
+ 'text' => wfMsg( 'unprotect' ),
'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
);
}
}
} else {
//article doesn't exist or is deleted
- if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'undelete' ) ) {
+ if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'deletedtext' ) ) {
if( $n = $this->mTitle->isDeleted() ) {
$undelTitle = SpecialPage::getTitleFor( 'Undelete' );
$content_actions['undelete'] = array(
'class' => false,
- 'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum($n) ),
+ 'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum( $n ) ),
'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
#'href' => self::makeSpecialUrl( "Undelete/$this->thispage" )
);
@@ -768,40 +827,40 @@ class SkinTemplate extends Skin {
if( !$this->mTitle->getRestrictions( 'create' ) ) {
$content_actions['protect'] = array(
'class' => ($action == 'protect') ? 'selected' : false,
- 'text' => wfMsg('protect'),
+ 'text' => wfMsg( 'protect' ),
'href' => $this->mTitle->getLocalUrl( 'action=protect' )
);
} else {
$content_actions['unprotect'] = array(
'class' => ($action == 'unprotect') ? 'selected' : false,
- 'text' => wfMsg('unprotect'),
+ 'text' => wfMsg( 'unprotect' ),
'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
);
}
}
}
- wfProfileOut( __METHOD__."-live" );
+ wfProfileOut( __METHOD__ . '-live' );
if( $this->loggedin ) {
if( !$this->mTitle->userIsWatching()) {
$content_actions['watch'] = array(
'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
- 'text' => wfMsg('watch'),
+ 'text' => wfMsg( 'watch' ),
'href' => $this->mTitle->getLocalUrl( 'action=watch' )
);
} else {
$content_actions['unwatch'] = array(
'class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
- 'text' => wfMsg('unwatch'),
+ 'text' => wfMsg( 'unwatch' ),
'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
);
}
}
- wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) ) ;
+ wfRunHooks( 'SkinTemplateTabs', array( $this, &$content_actions ) );
} else {
/* show special page tab */
@@ -826,10 +885,10 @@ class SkinTemplate extends Skin {
continue;
$selected = ( $code == $preferred )? 'selected' : false;
$content_actions['varlang-' . $vcount] = array(
- 'class' => $selected,
- 'text' => $varname,
- 'href' => $this->mTitle->getLocalURL('',$code)
- );
+ 'class' => $selected,
+ 'text' => $varname,
+ 'href' => $this->mTitle->getLocalURL( '', $code )
+ );
$vcount ++;
}
}
@@ -840,15 +899,13 @@ class SkinTemplate extends Skin {
return $content_actions;
}
-
-
/**
* build array of common navigation links
* @return array
* @private
*/
function buildNavUrls() {
- global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
+ global $wgUseTrackbacks, $wgOut, $wgUser, $wgRequest;
global $wgEnableUploads, $wgUploadNavigationUrl;
wfProfileIn( __METHOD__ );
@@ -857,17 +914,12 @@ class SkinTemplate extends Skin {
$nav_urls = array();
$nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
- if( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
- if ($wgUploadNavigationUrl) {
- $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
- } else {
- $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
- }
+ if( $wgUploadNavigationUrl ) {
+ $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
+ } elseif( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
+ $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
} else {
- if ($wgUploadNavigationUrl)
- $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
- else
- $nav_urls['upload'] = false;
+ $nav_urls['upload'] = false;
}
$nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
@@ -877,16 +929,18 @@ class SkinTemplate extends Skin {
// A print stylesheet is attached to all pages, but nobody ever
// figures that out. :) Add a link...
if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) {
- $nav_urls['print'] = array(
- 'text' => wfMsg( 'printableversion' ),
- 'href' => $wgRequest->appendQuery( 'printable=yes' )
- );
+ if ( !$wgOut->isPrintable() ) {
+ $nav_urls['print'] = array(
+ 'text' => wfMsg( 'printableversion' ),
+ 'href' => $wgRequest->appendQuery( 'printable=yes' )
+ );
+ }
// Also add a "permalink" while we're at it
if ( $this->mRevisionId ) {
$nav_urls['permalink'] = array(
'text' => wfMsg( 'permalink' ),
- 'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" )
+ 'href' => $wgOut->getTitle()->getLocalURL( "oldid=$this->mRevisionId" )
);
}
@@ -908,29 +962,34 @@ class SkinTemplate extends Skin {
} else {
$nav_urls['recentchangeslinked'] = false;
}
- if ($wgUseTrackbacks)
+ if( $wgUseTrackbacks )
$nav_urls['trackbacklink'] = array(
- 'href' => $wgTitle->trackbackURL()
+ 'href' => $wgOut->getTitle()->trackbackURL()
);
}
if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
- $id = User::idFromName($this->mTitle->getText());
- $ip = User::isIP($this->mTitle->getText());
+ $id = User::idFromName( $this->mTitle->getText() );
+ $ip = User::isIP( $this->mTitle->getText() );
} else {
$id = 0;
$ip = false;
}
- if($id || $ip) { # both anons and non-anons have contribs list
+ if( $id || $ip ) { # both anons and non-anons have contribs list
$nav_urls['contributions'] = array(
'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
);
if( $id ) {
$logPage = SpecialPage::getTitleFor( 'Log' );
- $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
- . $this->mTitle->getPartialUrl() ) );
+ $nav_urls['log'] = array(
+ 'href' => $logPage->getLocalUrl(
+ array(
+ 'user' => $this->mTitle->getText()
+ )
+ )
+ );
} else {
$nav_urls['log'] = false;
}
@@ -971,7 +1030,6 @@ class SkinTemplate extends Skin {
*/
function setupUserJs( $allowUserJs ) {
global $wgRequest, $wgJsMimeType;
-
wfProfileIn( __METHOD__ );
$action = $wgRequest->getVal( 'action', 'view' );
@@ -979,9 +1037,9 @@ class SkinTemplate extends Skin {
if( $allowUserJs && $this->loggedin ) {
if( $this->mTitle->isJsSubpage() and $this->userCanPreview( $action ) ) {
# XXX: additional security check/prompt?
- $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText('wpTextbox1') . ' /*]]>*/';
+ $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText( 'wpTextbox1' ) . ' /*]]>*/';
} else {
- $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType);
+ $this->userjs = self::makeUrl( $this->userpage . '/' . $this->skinname . '.js', 'action=raw&ctype=' . $wgJsMimeType );
}
}
wfProfileOut( __METHOD__ );
@@ -1000,6 +1058,10 @@ class SkinTemplate extends Skin {
wfProfileOut( __METHOD__ );
return $out;
}
+
+ public function commonPrintStylesheet() {
+ return false;
+ }
}
/**
@@ -1007,43 +1069,44 @@ class SkinTemplate extends Skin {
* compatible with what we use of PHPTAL 0.7.
* @ingroup Skins
*/
-class QuickTemplate {
+abstract class QuickTemplate {
/**
- * @public
+ * Constructor
*/
- function QuickTemplate() {
+ public function QuickTemplate() {
$this->data = array();
$this->translator = new MediaWiki_I18N();
}
/**
- * @public
+ * Sets the value $value to $name
+ * @param $name
+ * @param $value
*/
- function set( $name, $value ) {
+ public function set( $name, $value ) {
$this->data[$name] = $value;
}
/**
- * @public
+ * @param $name
+ * @param $value
*/
- function setRef($name, &$value) {
+ public function setRef( $name, &$value ) {
$this->data[$name] =& $value;
}
/**
- * @public
+ * @param $t
*/
- function setTranslator( &$t ) {
+ public function setTranslator( &$t ) {
$this->translator = &$t;
}
/**
- * @public
+ * Main function, used by classes that subclass QuickTemplate
+ * to show the actual HTML output
*/
- function execute() {
- echo "Override this function.";
- }
-
+ abstract public function execute();
/**
* @private
@@ -1085,10 +1148,10 @@ class QuickTemplate {
* @private
*/
function msgWiki( $str ) {
- global $wgParser, $wgTitle, $wgOut;
+ global $wgParser, $wgOut;
$text = $this->translator->translate( $str );
- $parserOutput = $wgParser->parse( $text, $wgTitle,
+ $parserOutput = $wgParser->parse( $text, $wgOut->getTitle(),
$wgOut->parserOptions(), true );
echo $parserOutput->getText();
}
@@ -1105,6 +1168,6 @@ class QuickTemplate {
*/
function haveMsg( $str ) {
$msg = $this->translator->translate( $str );
- return ($msg != '-') && ($msg != ''); # ????
+ return ( $msg != '-' ) && ( $msg != '' ); # ????
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-23 12:15:27 +0000