https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113973
Revision: 113973
Author: awjrichards
Date: 2012-03-15 23:10:53 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
MFT r113971
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/DisableTemplate.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/DisableTemplate.php
Modified:
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/DisableTemplate.php
===================================================================
---
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/DisableTemplate.php
2012-03-15 23:10:14 UTC (rev 113972)
+++
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/DisableTemplate.php
2012-03-15 23:10:53 UTC (rev 113973)
@@ -8,7 +8,9 @@
public function getHTML() {
- $currentURL = str_replace( '&mobileaction=disable_mobile_site',
'', $this->data['currentURL'] ); // TODO: $currentURl is unused
+
+ $currentURL = str_replace( '&mobileaction=disable_mobile_site',
'', $this->data['currentURL'] );
+ $currentURL = str_replace( '&useformat=mobile', '', $currentURL
);
$mobileRedirectFormAction =
$this->data['mobileRedirectFormAction'];
$disableHtml = <<<HTML
@@ -20,7 +22,7 @@
</p>
<div id='disableButtons'>
<form action='{$mobileRedirectFormAction}'
method='get'>
- <input name='to' type='hidden'
value='{$this->data['currentURL']}' />
+ <input name='to' type='hidden'
value='{$currentURL}' />
<input name='expires_in_days'
type='hidden' value='3650' />
<button id='disableButton'
type='submit'>{$this->data['disableButton']}</button>
</form>
Property changes on:
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/DisableTemplate.php
___________________________________________________________________
Added: svn:mergeinfo
+
/trunk/extensions/MobileFrontend/templates/DisableTemplate.php:99727,113442,113444,113471-113472,113486,113512,113553,113778,113971
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
