jenkins-bot has submitted this change and it was merged.
Change subject: Don't disable images whilst opting into beta
......................................................................
Don't disable images whilst opting into beta
Far too mean to be trolling like this.
Bug: T98187
Change-Id: Ifef83b8fa369f19f9a9d6eb4ab2164271104f8ea
(cherry picked from commit 391d6f37e3efee931ed1317b39f1c31d6c9d4ed0)
---
M includes/specials/SpecialMobileOptions.php
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialMobileOptions.php
b/includes/specials/SpecialMobileOptions.php
index 183c03a..f382761 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -269,11 +269,13 @@
}
$context->setMobileMode( $group );
$imagesDisabled = !$request->getBool( 'enableImages' );
- if ( $context->imagesDisabled() !== $imagesDisabled ) {
- // Only record when the state has changed
- $schemaData['images'] = $imagesDisabled ? "off" : "on";
+ if ( $request->getVal( 'enableImages' ) !== null ) {
+ if ( $context->imagesDisabled() !== $imagesDisabled ) {
+ // Only record when the state has changed
+ $schemaData['images'] = $imagesDisabled ? "off"
: "on";
+ }
+ $context->setDisableImagesCookie( $imagesDisabled );
}
- $context->setDisableImagesCookie( $imagesDisabled );
$returnToTitle = Title::newFromText( $request->getText(
'returnto' ) );
if ( $returnToTitle ) {
--
To view, visit https://gerrit.wikimedia.org/r/209318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef83b8fa369f19f9a9d6eb4ab2164271104f8ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: wmf/1.26wmf4
Gerrit-Owner: Robmoen <rm...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Robmoen <rm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
