From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 8 Dec 2015 03:10:17 +0000 (-0800)
Subject: Renamed confusing initial $status var in doEditContent()
X-Git-Tag: 1.31.0-rc.0~8762
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=c655e38f75898463ef0a70d79abfa83b84b83852;p=lhc%2Fweb%2Fwiklou.git

Renamed confusing initial $status var in doEditContent()

Change-Id: I22cad9eb3fb4040e5506b0cccd573871d108d257
---

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index eadabaca87..294a22c802 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1690,19 +1690,19 @@ class WikiPage implements Page, IDBAccessObject {
 		$flags = $this->checkFlags( $flags );
 
 		// Trigger pre-save hook (using provided edit summary)
-		$status = Status::newGood( array() );
+		$hookStatus = Status::newGood( array() );
 		$hook_args = array( &$this, &$user, &$content, &$summary,
-							$flags & EDIT_MINOR, null, null, &$flags, &$status );
+							$flags & EDIT_MINOR, null, null, &$flags, &$hookStatus );
 		// Check if the hook rejected the attempted save
 		if ( !Hooks::run( 'PageContentSave', $hook_args )
 			|| !ContentHandler::runLegacyHooks( 'ArticleSave', $hook_args )
 		) {
-			if ( $status->isOK() ) {
+			if ( $hookStatus->isOK() ) {
 				// Hook returned false but didn't call fatal(); use generic message
-				$status->fatal( 'edit-hook-aborted' );
+				$hookStatus->fatal( 'edit-hook-aborted' );
 			}
 
-			return $status;
+			return $hookStatus;
 		}
 
 		$old_revision = $this->getRevision(); // current revision