around the body text
+ # An ID that includes the actual body text; without categories, contentSub, ...
+ $realBodyAttribs = array( 'id' => 'mw-content-text' );
+
+ # Add a mw-content-ltr/rtl class to be able to style based on text direction
+ # when the content is different from the UI language, i.e.:
# not for special pages or file pages AND only when viewing AND if the page exists
# (or is in MW namespace, because that has default content)
- if( !in_array( $this->getTitle()->getNamespace(), array( NS_SPECIAL, NS_FILE ) ) &&
+ if( !in_array( $title->getNamespace(), array( NS_SPECIAL, NS_FILE ) ) &&
in_array( $request->getVal( 'action', 'view' ), array( 'view', 'historysubmit' ) ) &&
- ( $this->getTitle()->exists() || $this->getTitle()->getNamespace() == NS_MEDIAWIKI ) ) {
- $pageLang = $this->getTitle()->getPageLanguage();
- $realBodyAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),
- 'class' => 'mw-content-'.$pageLang->getDir() );
- $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
+ ( $title->exists() || $title->getNamespace() == NS_MEDIAWIKI ) ) {
+ $pageLang = $title->getPageLanguage();
+ $realBodyAttribs['lang'] = $pageLang->getHtmlCode();
+ $realBodyAttribs['dir'] = $pageLang->getDir();
+ $realBodyAttribs['class'] = 'mw-content-'.$pageLang->getDir();
}
+ $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
$tpl->setRef( 'bodytext', $out->mBodytext );
# Language links
@@ -438,10 +424,12 @@ class SkinTemplate extends Skin {
if ( $nt ) {
$language_urls[] = array(
'href' => $nt->getFullURL(),
- 'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
- $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
+ 'text' => ( Language::fetchLanguageName( $nt->getInterwiki() ) != '' ?
+ Language::fetchLanguageName( $nt->getInterwiki() ) : $l ),
'title' => $nt->getText(),
- 'class' => $class
+ 'class' => $class,
+ 'lang' => $nt->getInterwiki(),
+ 'hreflang' => $nt->getInterwiki(),
);
}
}
@@ -468,10 +456,11 @@ class SkinTemplate extends Skin {
if ( $this->useHeadElement ) {
$tpl->set( 'headelement', $out->headElement( $this ) );
} else {
- $tpl->set( 'headscripts', $out->getScript() );
+ $tpl->set( 'headscripts', $out->getHeadScripts() . $out->getHeadItems() );
}
$tpl->set( 'debughtml', $this->generateDebugHTML() );
+ $tpl->set( 'reporttime', wfReportTime() );
// original version by hansm
if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
@@ -525,6 +514,7 @@ class SkinTemplate extends Skin {
* This is setup as a method so that like with $wgLogo and getLogo() a skin
* can override this setting and always output one or the other if it has
* a reason it can't output one of the two modes.
+ * @return bool
*/
function useCombinedLoginLink() {
global $wgUseCombinedLoginLink;
@@ -544,16 +534,24 @@ class SkinTemplate extends Skin {
/* set up the default links for the personal toolbar */
$personal_urls = array();
- $page = $request->getVal( 'returnto', $this->thispage );
- $query = $request->getVal( 'returntoquery', $this->thisquery );
- $a = array( 'returnto' => $page );
- if( $query != '' ) {
- $a['returntoquery'] = $query;
+ # Due to bug 32276, if a user does not have read permissions,
+ # $this->getTitle() will just give Special:Badtitle, which is
+ # not especially useful as a returnto parameter. Use the title
+ # from the request instead, if there was one.
+ $page = Title::newFromURL( $request->getVal( 'title', '' ) );
+ $page = $request->getVal( 'returnto', $page );
+ $a = array();
+ if ( strval( $page ) !== '' ) {
+ $a['returnto'] = $page;
+ $query = $request->getVal( 'returntoquery', $this->thisquery );
+ if( $query != '' ) {
+ $a['returntoquery'] = $query;
+ }
}
$returnto = wfArrayToCGI( $a );
if( $this->loggedin ) {
$personal_urls['userpage'] = array(
- 'text' => $this->userdisplayname,
+ 'text' => $this->username,
'href' => &$this->userpageUrlDetails['href'],
'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $this->userpageUrlDetails['href'] == $pageurl )
@@ -579,10 +577,12 @@ class SkinTemplate extends Skin {
);
# We need to do an explicit check for Special:Contributions, as we
- # have to match both the title, and the target (which could come
- # 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.
+ # have to match both the title, and the target, which could come
+ # from request values (Special:Contributions?target=Jimbo_Wales)
+ # or be specified in "sub page" form
+ # (Special:Contributions/Jimbo_Wales). The plot
+ # thickens, because the Title object is altered for special pages,
+ # so it doesn't contain the original alias-with-subpage.
$origTitle = Title::newFromText( $request->getText( 'title' ) );
if( $origTitle instanceof Title && $origTitle->isSpecialPage() ) {
list( $spName, $spPar ) = SpecialPageFactory::resolveAlias( $origTitle->getText() );
@@ -648,7 +648,7 @@ class SkinTemplate extends Skin {
if( $this->showIPinHeader() ) {
$href = &$this->userpageUrlDetails['href'];
$personal_urls['anonuserpage'] = array(
- 'text' => $this->userdisplayname,
+ 'text' => $this->username,
'href' => $href,
'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $pageurl == $href )
@@ -873,7 +873,7 @@ class SkinTemplate extends Skin {
'href' => $title->getLocalURL( $this->editUrlOptions() ),
'primary' => true, // don't collapse this in vector
);
-
+
// section link
if ( $showNewSection ) {
// Adds new section link
@@ -982,7 +982,7 @@ class SkinTemplate extends Skin {
// Checks that language conversion is enabled and variants exist
// And if it is not in the special namespace
if( count( $variants ) > 1 ) {
- // Gets preferred variant (note that user preference is
+ // Gets preferred variant (note that user preference is
// only possible for wiki content language variant)
$preferred = $pageLang->getPreferredVariant();
// Loops over each variant
@@ -998,7 +998,9 @@ class SkinTemplate extends Skin {
$content_navigation['variants'][] = array(
'class' => ( $code == $preferred ) ? 'selected' : false,
'text' => $varname,
- 'href' => $title->getLocalURL( '', $code )
+ 'href' => $title->getLocalURL( array( 'variant' => $code ) ),
+ 'lang' => $code,
+ 'hreflang' => $code
);
}
}
@@ -1169,7 +1171,7 @@ class SkinTemplate extends Skin {
$nav_urls['whatlinkshere'] = array(
'href' => SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage )->getLocalUrl()
);
- if ( $this->getTitle()->getArticleId() ) {
+ if ( $this->getTitle()->getArticleID() ) {
$nav_urls['recentchangeslinked'] = array(
'href' => SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage )->getLocalUrl()
);
@@ -1184,12 +1186,10 @@ class SkinTemplate extends Skin {
'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser )
);
- if ( $user->isLoggedIn() ) {
- $logPage = SpecialPage::getTitleFor( 'Log' );
- $nav_urls['log'] = array(
- 'href' => $logPage->getLocalUrl( array( 'user' => $rootUser ) )
- );
- }
+ $logPage = SpecialPage::getTitleFor( 'Log' );
+ $nav_urls['log'] = array(
+ 'href' => $logPage->getLocalUrl( array( 'user' => $rootUser ) )
+ );
if ( $this->getUser()->isAllowed( 'block' ) ) {
$nav_urls['blockip'] = array(
@@ -1217,25 +1217,6 @@ class SkinTemplate extends Skin {
return $this->getTitle()->getNamespaceKey();
}
- /**
- * @private
- * @todo FIXME: Why is this duplicated in/from OutputPage::getHeadScripts()??
- */
- function setupUserJs( $allowUserJs ) {
- global $wgJsMimeType;
- wfProfileIn( __METHOD__ );
-
- if( $allowUserJs && $this->loggedin ) {
- if( $this->getTitle()->isJsSubpage() and $this->getOutput()->userCanPreview() ) {
- # XXX: additional security check/prompt?
- $this->userjsprev = '/*getRequest()->getText( 'wpTextbox1' ) . ' /*]]>*/';
- } else {
- $this->userjs = self::makeUrl( $this->userpage . '/' . $this->skinname . '.js', 'action=raw&ctype=' . $wgJsMimeType );
- }
- }
- wfProfileOut( __METHOD__ );
- }
-
public function commonPrintStylesheet() {
return false;
}
@@ -1333,6 +1314,7 @@ abstract class QuickTemplate {
/**
* @private
+ * @return bool
*/
function haveData( $str ) {
return isset( $this->data[$str] );
@@ -1368,7 +1350,7 @@ abstract class BaseTemplate extends QuickTemplate {
/**
* Get a Message object with its context set
*
- * @param $name Str message name
+ * @param $name string message name
* @return Message
*/
public function getMsg( $name ) {
@@ -1392,6 +1374,7 @@ abstract class BaseTemplate extends QuickTemplate {
* stored by SkinTemplate.
* The resulting array is built acording to a format intended to be passed
* through makeListItem to generate the html.
+ * @return array
*/
function getToolbox() {
wfProfileIn( __METHOD__ );
@@ -1486,7 +1469,7 @@ abstract class BaseTemplate extends QuickTemplate {
if ( !isset( $sidebar['LANGUAGES'] ) ) {
$sidebar['LANGUAGES'] = true;
}
-
+
if ( !isset( $options['search'] ) || $options['search'] !== true ) {
unset( $sidebar['SEARCH'] );
}
@@ -1496,7 +1479,7 @@ abstract class BaseTemplate extends QuickTemplate {
if ( isset( $options['languages'] ) && $options['languages'] === false ) {
unset( $sidebar['LANGUAGES'] );
}
-
+
$boxes = array();
foreach ( $sidebar as $boxName => $content ) {
if ( $content === false ) {
@@ -1530,7 +1513,7 @@ abstract class BaseTemplate extends QuickTemplate {
'generated' => false,
'content' => $this->data['language_urls'],
);
- }
+ }
break;
default:
$msgObj = $this->getMsg( $boxName );
@@ -1543,7 +1526,7 @@ abstract class BaseTemplate extends QuickTemplate {
break;
}
}
-
+
// HACK: Compatibility with extensions still using SkinTemplateToolboxEnd
$hookContents = null;
if ( isset( $boxes['TOOLBOX'] ) ) {
@@ -1558,7 +1541,7 @@ abstract class BaseTemplate extends QuickTemplate {
}
}
// END hack
-
+
if ( isset( $options['htmlOnly'] ) && $options['htmlOnly'] === true ) {
foreach ( $boxes as $boxName => $box ) {
if ( is_array( $box['content'] ) ) {
@@ -1568,7 +1551,7 @@ abstract class BaseTemplate extends QuickTemplate {
}
// HACK, shove the toolbox end onto the toolbox if we're rendering itself
if ( $hookContents ) {
- $content .= "\n $hookContents";
+ $content .= "\n $hookContents";
}
// END hack
$content .= "\n\n";
@@ -1598,7 +1581,7 @@ abstract class BaseTemplate extends QuickTemplate {
// END hack
}
}
-
+
return $boxes;
}
@@ -1626,6 +1609,7 @@ abstract class BaseTemplate extends QuickTemplate {
* A link-fallback can be used to specify a tag to use instead of
if there is
* no link. eg: If you specify 'link-fallback' => 'span' than any non-link will
* output a instead of just text.
+ * @return string
*/
function makeLink( $key, $item, $options = array() ) {
if ( isset( $item['text'] ) ) {
@@ -1704,6 +1688,7 @@ abstract class BaseTemplate extends QuickTemplate {
* If you need an id or class on a single link you should include a "links"
* array with just one link item inside of it.
* $options is also passed on to makeLink calls
+ * @return string
*/
function makeListItem( $key, $item, $options = array() ) {
if ( isset( $item['links'] ) ) {
@@ -1798,6 +1783,7 @@ abstract class BaseTemplate extends QuickTemplate {
* If you pass "flat" as an option then the returned array will be a flat array
* of footer icons instead of a key/value array of footerlinks arrays broken
* up into categories.
+ * @return array|mixed
*/
function getFooterLinks( $option = null ) {
$footerlinks = $this->data['footerlinks'];
@@ -1836,6 +1822,7 @@ abstract class BaseTemplate extends QuickTemplate {
* in the list of footer icons. This is mostly useful for skins which only
* display the text from footericons instead of the images and don't want a
* duplicate copyright statement because footerlinks already rendered one.
+ * @return
*/
function getFooterIcons( $option = null ) {
// Generate additional footer icons