Merge "Remove ParserTestParser hook from hooks.txt"

[lhc/web/wiklou.git] / includes / actions / MarkpatrolledAction.php

diff --git a/includes/actions/MarkpatrolledAction.php b/includes/actions/MarkpatrolledAction.php
index 4016f67..85ea87c 100644 (file)
--- a/includes/actions/MarkpatrolledAction.php
+++ b/includes/actions/MarkpatrolledAction.php
@@ -53,20 +53,26 @@ class MarkpatrolledAction extends FormlessAction {
 
                $errors = $rc->doMarkPatrolled( $user );
 
-               if ( in_array( array( 'rcpatroldisabled' ), $errors ) ) {
+               if ( in_array( [ 'rcpatroldisabled' ], $errors ) ) {
                        throw new ErrorPageError( 'rcpatroldisabled', 'rcpatroldisabledtext' );
                }
 
-               if ( in_array( array( 'hookaborted' ), $errors ) ) {
+               if ( in_array( [ 'hookaborted' ], $errors ) ) {
                        // The hook itself has handled any output
                        return;
                }
 
                # It would be nice to see where the user had actually come from, but for now just guess
-               $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges';
-               $return = SpecialPage::getTitleFor( $returnto );
+               if ( $rc->getAttribute( 'rc_type' ) == RC_NEW ) {
+                       $returnTo = 'Newpages';
+               } elseif ( $rc->getAttribute( 'rc_log_type' ) == 'upload' ) {
+                       $returnTo = 'Newfiles';
+               } else {
+                       $returnTo = 'Recentchanges';
+               }
+               $return = SpecialPage::getTitleFor( $returnTo );
 
-               if ( in_array( array( 'markedaspatrollederror-noautopatrol' ), $errors ) ) {
+               if ( in_array( [ 'markedaspatrollederror-noautopatrol' ], $errors ) ) {
                        $this->getOutput()->setPageTitle( $this->msg( 'markedaspatrollederror' ) );
                        $this->getOutput()->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
                        $this->getOutput()->returnToMain( null, $return );
@@ -83,4 +89,8 @@ class MarkpatrolledAction extends FormlessAction {
                $this->getOutput()->addWikiMsg( 'markedaspatrolledtext', $rc->getTitle()->getPrefixedText() );
                $this->getOutput()->returnToMain( null, $return );
        }
+
+       public function doesWrites() {
+               return true;
+       }
 }