http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94267
Revision: 94267
Author: preilly
Date: 2011-08-11 18:48:07 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
fix for Bug 30153 - allow editing with default non-mobile view and also remove
commented out code that was refactored
Modified Paths:
--------------
branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
Modified: branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
===================================================================
--- branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-11 18:45:10 UTC (rev 94266)
+++ branches/wmf/1.17wmf1/extensions/MobileFrontend/MobileFrontend.php
2011-08-11 18:48:07 UTC (rev 94267)
@@ -49,7 +49,7 @@
$wgHooks['SkinTemplateOutputPageBeforeExec'][] = array( &$wgExtMobileFrontend,
'addMobileFooter' );
class ExtMobileFrontend {
- const VERSION = '0.5.17';
+ const VERSION = '0.5.18';
/**
* @var DOMDocument
@@ -173,34 +173,6 @@
self::$title = $out->getTitle();
self::$htmlTitle = $out->getHTMLTitle();
- // 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();
-
- // 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::$dir = $wgContLang->getDir();
- //self::$code = $wgContLang->getCode();
-
- self::$disableImages = $wgRequest->getText( 'disableImages', 0
);
-
- //self::$mainPageUrl = Title::newMainPage()->getLocalUrl();
- //self::$randomPageUrl = SpecialPage::getTitleFor( 'Randompage'
)->getLocalUrl();
-
$userAgent = $_SERVER['HTTP_USER_AGENT'];
$uAmd5 = md5($userAgent);
@@ -234,6 +206,8 @@
// This is stated to be intended behavior, as per the
following: [http://bugs.php.net/bug.php?id=40104]
$mAction = $wgRequest->getText( 'mAction' );
+ $action = $wgRequest->getText( 'action' );
+ self::$disableImages = $wgRequest->getText( 'disableImages', 0
);
self::$useFormat = $wgRequest->getText( 'useFormat' );
self::$format = $wgRequest->getText( 'format' );
self::$requestedSegment = $wgRequest->getText( 'seg', 0 );
@@ -325,9 +299,11 @@
if (self::$useFormat === 'mobile' ||
self::$useFormat === 'mobile-wap' ||
!empty( $xDevice ) ) {
- $this->getMsg();
- $this->disableCaching();
- ob_start( array( $this, 'DOMParse' ) );
+ if ( $action !== 'edit' ) {
+ $this->getMsg();
+ $this->disableCaching();
+ ob_start( array( $this, 'DOMParse' ) );
+ }
}
return true;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
