Merge "Wrap StatusValue in Status for HTMLForm submit callback"

1 files changed, 6 insertions, 6 deletions

diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 725816dc36a1..5d5377cb85e3 100644
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -81,16 +81,16 @@ class WatchAction extends FormAction {
 	}
 
 	public function onSubmit( $data ) {
-		$expiry = $this->getRequest()->getVal( 'wp' . $this->expiryFormFieldName );
-
-		// Even though we're never unwatching here, use WatchlistManager::setWatch() because it also checks for
-		// changed expiry.
-		return $this->watchlistManager->setWatch(
+		// Even though we're never unwatching here, use WatchlistManager::setWatch()
+		// because it also checks for changed expiry.
+		$result = $this->watchlistManager->setWatch(
 			true,
 			$this->getContext()->getAuthority(),
 			$this->getTitle(),
-			$expiry
+			$this->getRequest()->getVal( 'wp' . $this->expiryFormFieldName )
 		);
+
+		return Status::wrap( $result );
 	}
 
 	protected function checkCanExecute( User $user ) {