http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93731
Revision: 93731
Author: preilly
Date: 2011-08-02 11:55:27 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
move calls to wfMsg to a method and only call if rendering mobile extension
Modified Paths:
--------------
trunk/extensions/MobileFrontend/MobileFrontend.php
Modified: trunk/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-02 11:55:05 UTC
(rev 93730)
+++ trunk/extensions/MobileFrontend/MobileFrontend.php 2011-08-02 11:55:27 UTC
(rev 93731)
@@ -125,6 +125,26 @@
return true;
}
+ public function getMsg() {
+ global $wgUser;
+ $skin = $wgUser->getSkin();
+ $copyright = $skin->getCopyright();
+ // Need to stash the results of the "wfMsg" call before the
Output Buffering handler
+ // because at this point the database connection is shut down,
etc.
+ self::$messages['mobile-frontend-show'] =
wfMsg( 'mobile-frontend-show-button' );
+ self::$messages['mobile-frontend-hide'] =
wfMsg( 'mobile-frontend-hide-button' );
+ self::$messages['mobile-frontend-back-to-top'] =
wfMsg( 'mobile-frontend-back-to-top-of-section' );
+ self::$messages['mobile-frontend-regular-site'] =
wfMsg( 'mobile-frontend-regular-site' );
+ self::$messages['mobile-frontend-perm-stop-redirect'] = wfMsg(
'mobile-frontend-perm-stop-redirect' );
+ self::$messages['mobile-frontend-copyright'] =
$copyright;
+ self::$messages['mobile-frontend-home-button'] =
wfMsg( 'mobile-frontend-home-button' );
+ self::$messages['mobile-frontend-random-button'] =
wfMsg( 'mobile-frontend-random-button' );
+ self::$messages['mobile-frontend-are-you-sure'] =
wfMsg( 'mobile-frontend-are-you-sure' );
+ self::$messages['mobile-frontend-explain-disable'] =
wfMsg( 'mobile-frontend-explain-disable' );
+ self::$messages['mobile-frontend-disable-button'] =
wfMsg( 'mobile-frontend-disable-button' );
+ self::$messages['mobile-frontend-back-button'] =
wfMsg( 'mobile-frontend-back-button' );
+ }
+
/**
* @param $out Outputpage
* @param $text String
@@ -139,23 +159,23 @@
// Need to get copyright footer from skin. The footer changes
depending
// on whether we're using the WikimediaMessages extension or
not.
- $skin = $wgUser->getSkin();
- $copyright = $skin->getCopyright();
+ //$skin = $wgUser->getSkin();
+ //$copyright = $skin->getCopyright();
// Need to stash the results of the "wfMsg" call before the
Output Buffering handler
// because at this point the database connection is shut down,
etc.
- self::$messages['mobile-frontend-show']
= wfMsg( 'mobile-frontend-show-button' );
- self::$messages['mobile-frontend-hide']
= wfMsg( 'mobile-frontend-hide-button' );
- self::$messages['mobile-frontend-back-to-top'] =
wfMsg( 'mobile-frontend-back-to-top-of-section' );
- self::$messages['mobile-frontend-regular-site'] =
wfMsg( 'mobile-frontend-regular-site' );
- self::$messages['mobile-frontend-perm-stop-redirect'] = wfMsg(
'mobile-frontend-perm-stop-redirect' );
- self::$messages['mobile-frontend-copyright'] =
$copyright;
- self::$messages['mobile-frontend-home-button'] =
wfMsg( 'mobile-frontend-home-button' );
- self::$messages['mobile-frontend-random-button'] =
wfMsg( 'mobile-frontend-random-button' );
- self::$messages['mobile-frontend-are-you-sure'] =
wfMsg( 'mobile-frontend-are-you-sure' );
- self::$messages['mobile-frontend-explain-disable'] =
wfMsg( 'mobile-frontend-explain-disable' );
- self::$messages['mobile-frontend-disable-button'] =
wfMsg( 'mobile-frontend-disable-button' );
- self::$messages['mobile-frontend-back-button'] =
wfMsg( 'mobile-frontend-back-button' );
+ //self::$messages['mobile-frontend-show']
= wfMsg( 'mobile-frontend-show-button' );
+ //self::$messages['mobile-frontend-hide']
= wfMsg( 'mobile-frontend-hide-button' );
+ //self::$messages['mobile-frontend-back-to-top']
= wfMsg( 'mobile-frontend-back-to-top-of-section' );
+ //self::$messages['mobile-frontend-regular-site']
= wfMsg( 'mobile-frontend-regular-site' );
+ //self::$messages['mobile-frontend-perm-stop-redirect'] =
wfMsg( 'mobile-frontend-perm-stop-redirect' );
+ //self::$messages['mobile-frontend-copyright'] =
$copyright;
+ //self::$messages['mobile-frontend-home-button']
= wfMsg( 'mobile-frontend-home-button' );
+ //self::$messages['mobile-frontend-random-button'] =
wfMsg( 'mobile-frontend-random-button' );
+ //self::$messages['mobile-frontend-are-you-sure']
= wfMsg( 'mobile-frontend-are-you-sure' );
+ //self::$messages['mobile-frontend-explain-disable'] =
wfMsg( 'mobile-frontend-explain-disable' );
+ //self::$messages['mobile-frontend-disable-button'] =
wfMsg( 'mobile-frontend-disable-button' );
+ //self::$messages['mobile-frontend-back-button']
= wfMsg( 'mobile-frontend-back-button' );
self::$dir = $wgContLang->getDir();
self::$code = $wgContLang->getCode();
@@ -164,7 +184,7 @@
self::$mainPageUrl = Title::newMainPage()->getLocalUrl();
self::$randomPageUrl = SpecialPage::getTitleFor( 'Randompage'
)->getLocalUrl();
-
+
$userAgent = $_SERVER['HTTP_USER_AGENT'];
$uAmd5 = md5($userAgent);
@@ -242,7 +262,7 @@
// WURFL documentation:
http://wurfl.sourceforge.net/help_doc.php
// Determine the kind of markup
if( is_array( $props ) && $props['preferred_markup'] ) {
- wfDebug( __METHOD__ . ": preferred markup for this
device: " . $props['preferred_markup'] );
+ //wfDebug( __METHOD__ . ": preferred markup for this
device: " . $props['preferred_markup'] );
// xhtml/html: html_web_3_2, html_web_4_0
// xthml basic/xhtmlmp (wap 2.0): html_wi_w3_xhtmlbasic
html_wi_oma_xhtmlmp_1_0
// chtml (imode): html_wi_imode_*
@@ -264,6 +284,7 @@
if (self::$useFormat === 'mobile' ||
self::$useFormat === 'mobile-wap' ) {
+ $this->getMsg();
$this->disableCaching();
ob_start( array( $this, 'DOMParse' ) );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
