https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114342
Revision: 114342
Author: awjrichards
Date: 2012-03-21 01:05:44 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
MFT r114341
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/MobileFrontend/
Property changes on: branches/wmf/1.19wmf1/extensions/MobileFrontend
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/MobileFrontend:99727,114313,114315,114319
+ /trunk/extensions/MobileFrontend:99727,114313,114315,114319,114341
Modified:
branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
2012-03-21 01:04:25 UTC (rev 114341)
+++ branches/wmf/1.19wmf1/extensions/MobileFrontend/MobileFrontend.body.php
2012-03-21 01:05:44 UTC (rev 114342)
@@ -443,7 +443,9 @@
self::$device = $device->format( $formatName );
$this->setDefaultLogo();
- $this->contentFormat = self::parseContentFormat(
self::$device['view_format'] );
+ // honor useformat=mobile-wap if it's set, otherwise determine
by device
+ $viewFormat = ( $this->getUseFormat() == 'mobile-wap' ) ?
'mobile-wap' : self::$device['view_format'];
+ $this->contentFormat = self::parseContentFormat( $viewFormat );
if ( $mobileAction == 'leave_feedback' ) {
echo $this->renderLeaveFeedbackXHTML();
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
