Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261033
Change subject: Preferences: Use cookie instead of URL parameter for success
......................................................................
Preferences: Use cookie instead of URL parameter for success
This change avoids changing the URL for the success message.
Bug: T26700
Change-Id: I1c2b011e7a66b2b9379dd4a3fdcc6f978dd43b52
---
M includes/Preferences.php
M includes/specials/SpecialPreferences.php
2 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/261033/1
diff --git a/includes/Preferences.php b/includes/Preferences.php
index ad25fa8..0cca27a 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1470,7 +1470,7 @@
$res = self::tryFormSubmit( $formData, $form );
if ( $res ) {
- $urlOptions = array( 'success' => 1 );
+ $urlOptions = array();
if ( $res === 'eauth' ) {
$urlOptions['eauth'] = 1;
@@ -1480,7 +1480,11 @@
$url = $form->getTitle()->getFullURL( $urlOptions );
- $form->getContext()->getOutput()->redirect( $url );
+ $out = $form->getContext()->getOutput();
+ $response = $out->getRequest()->response();
+ // Set cookie for success message
+ $response->setCookie( 'Success', 1 );
+ $out->redirect( $url );
}
return Status::newGood();
diff --git a/includes/specials/SpecialPreferences.php
b/includes/specials/SpecialPreferences.php
index 49ab6d5..48174ad 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -49,7 +49,10 @@
$out->addModules( 'mediawiki.special.preferences' );
$out->addModuleStyles( 'mediawiki.special.preferences.styles' );
- if ( $this->getRequest()->getCheck( 'success' ) ) {
+ $request = $this->getRequest();
+ if ( $request->getCookie( 'Success' ) ) {
+ // Remove cookie
+ $request->response()->setCookie( 'Success' );
$out->wrapWikiMsg(
Html::rawElement(
'div',
--
To view, visit https://gerrit.wikimedia.org/r/261033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c2b011e7a66b2b9379dd4a3fdcc6f978dd43b52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
