X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Factions%2FRollbackAction.php;h=aa2858d8e3c6e20455f3cd9310900113ccbc9398;hb=a3b1ef7c21ba9af94f611f6ca1d64e75710db176;hp=65159f2bb25cf10e3bc98435bd6fa1ba46a0752f;hpb=fbb60061d2c13f1c0acfe3d349c2e4a9a1821c87;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
index 65159f2bb2..aa2858d8e3 100644
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -54,9 +54,12 @@ class RollbackAction extends FormlessAction {
 		$user = $this->getUser();
 		$from = $request->getVal( 'from' );
 		$rev = $this->page->getRevision();
-		if ( $from === null || $from === '' ) {
+		if ( $from === null ) {
 			throw new ErrorPageError( 'rollbackfailed', 'rollback-missingparam' );
 		}
+		if ( !$rev ) {
+			throw new ErrorPageError( 'rollbackfailed', 'rollback-missingrevision' );
+		}
 		if ( $from !== $rev->getUserText() ) {
 			throw new ErrorPageError( 'rollbackfailed', 'alreadyrolled', [
 				$this->getTitle()->getPrefixedText(),
@@ -97,7 +100,7 @@ class RollbackAction extends FormlessAction {
 				}
 			}
 
-			return true;
+			return;
 		}
 
 		# NOTE: Permission errors already handled by Action::checkExecute.
@@ -142,7 +145,7 @@ class RollbackAction extends FormlessAction {
 			);
 			$de->showDiff( '', '' );
 		}
-		return true;
+		return;
 	}
 
 	protected function getDescription() {