[MediaWiki-commits] [Gerrit] Do not resolve redirects on reject - change (mediawiki...FlaggedRevs)

2016-05-30 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Do not resolve redirects on reject
..


Do not resolve redirects on reject

Bug: T136473
Change-Id: I77d2d055b7c562d7a2a3e32c4e193683c6006f7d
---
M frontend/specialpages/actions/RevisionReview_body.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/frontend/specialpages/actions/RevisionReview_body.php 
b/frontend/specialpages/actions/RevisionReview_body.php
index 1e157e5..1233d27 100644
--- a/frontend/specialpages/actions/RevisionReview_body.php
+++ b/frontend/specialpages/actions/RevisionReview_body.php
@@ -116,7 +116,8 @@
} elseif ( $form->getAction() === 
'unapprove' ) {
$out->addHTML( 
$this->deapprovalSuccessHTML( true ) );
} elseif ( $form->getAction() === 
'reject' ) {
-   $out->redirect( 
$this->page->getFullUrl() );
+   $query = 
$this->page->isRedirect() ? [ 'redirect' => 'no' ] : [];
+   $out->redirect( 
$this->page->getFullUrl( $query ) );
}
// Failure...
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/291499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I77d2d055b7c562d7a2a3e32c4e193683c6006f7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Gerrit Patch Uploader 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Do not resolve redirects on reject - change (mediawiki...FlaggedRevs)

2016-05-28 Thread Gerrit Patch Uploader (Code Review) 
Gerrit Patch Uploader has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291499

Change subject: Do not resolve redirects on reject
..

Do not resolve redirects on reject

Bug: T136473
Change-Id: I77d2d055b7c562d7a2a3e32c4e193683c6006f7d
---
M frontend/specialpages/actions/RevisionReview_body.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/99/291499/1

diff --git a/frontend/specialpages/actions/RevisionReview_body.php 
b/frontend/specialpages/actions/RevisionReview_body.php
index 1e157e5..1233d27 100644
--- a/frontend/specialpages/actions/RevisionReview_body.php
+++ b/frontend/specialpages/actions/RevisionReview_body.php
@@ -116,7 +116,8 @@
} elseif ( $form->getAction() === 
'unapprove' ) {
$out->addHTML( 
$this->deapprovalSuccessHTML( true ) );
} elseif ( $form->getAction() === 
'reject' ) {
-   $out->redirect( 
$this->page->getFullUrl() );
+   $query = 
$this->page->isRedirect() ? [ 'redirect' => 'no' ] : [];
+   $out->redirect( 
$this->page->getFullUrl( $query ) );
}
// Failure...
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/291499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77d2d055b7c562d7a2a3e32c4e193683c6006f7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits