Update to MediaWiki 1.19.0

1 files changed, 58 insertions, 62 deletions

diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index 2b949ba9..9ed6d08d 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -24,11 +24,6 @@
  * @file
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	// Eclipse helper - will be ignored in production
-	require_once( "ApiBase.php" );
-}
-
 /**
  * A module that allows for editing and creating pages.
  *
@@ -43,7 +38,7 @@ class ApiEditPage extends ApiBase {
 	}
 
 	public function execute() {
-		global $wgUser;
+		$user = $this->getUser();
 		$params = $this->extractRequestParams();
 
 		if ( is_null( $params['text'] ) && is_null( $params['appendtext'] ) &&
@@ -87,10 +82,6 @@ class ApiEditPage extends ApiBase {
 			}
 		}
 
-		// Some functions depend on $wgTitle == $ep->mTitle
-		global $wgTitle;
-		$wgTitle = $titleObj;
-
 		if ( $params['createonly'] && $titleObj->exists() ) {
 			$this->dieUsageMsg( 'createonly-exists' );
 		}
@@ -99,15 +90,16 @@ class ApiEditPage extends ApiBase {
 		}
 
 		// Now let's check whether we're even allowed to do this
-		$errors = $titleObj->getUserPermissionsErrors( 'edit', $wgUser );
+		$errors = $titleObj->getUserPermissionsErrors( 'edit', $user );
 		if ( !$titleObj->exists() ) {
-			$errors = array_merge( $errors, $titleObj->getUserPermissionsErrors( 'create', $wgUser ) );
+			$errors = array_merge( $errors, $titleObj->getUserPermissionsErrors( 'create', $user ) );
 		}
 		if ( count( $errors ) ) {
 			$this->dieUsageMsg( $errors[0] );
 		}
 
-		$articleObj = new Article( $titleObj );
+		$articleObj = Article::newFromTitle( $titleObj, $this->getContext() );
+
 		$toMD5 = $params['text'];
 		if ( !is_null( $params['appendtext'] ) || !is_null( $params['prependtext'] ) )
 		{
@@ -178,41 +170,42 @@ class ApiEditPage extends ApiBase {
 			$this->dieUsageMsg( 'hashcheckfailed' );
 		}
 
-		$ep = new EditPage( $articleObj );
-		$ep->setContextTitle( $titleObj );
-
 		// EditPage wants to parse its stuff from a WebRequest
 		// That interface kind of sucks, but it's workable
-		$reqArr = array(
+		$requestArray = array(
 			'wpTextbox1' => $params['text'],
 			'wpEditToken' => $params['token'],
 			'wpIgnoreBlankSummary' => ''
 		);
 
 		if ( !is_null( $params['summary'] ) ) {
-			$reqArr['wpSummary'] = $params['summary'];
+			$requestArray['wpSummary'] = $params['summary'];
+		}
+		
+		if ( !is_null( $params['sectiontitle'] ) ) {
+			$requestArray['wpSectionTitle'] = $params['sectiontitle'];
 		}
 
 		// Watch out for basetimestamp == ''
 		// wfTimestamp() treats it as NOW, almost certainly causing an edit conflict
 		if ( !is_null( $params['basetimestamp'] ) && $params['basetimestamp'] != '' ) {
-			$reqArr['wpEdittime'] = wfTimestamp( TS_MW, $params['basetimestamp'] );
+			$requestArray['wpEdittime'] = wfTimestamp( TS_MW, $params['basetimestamp'] );
 		} else {
-			$reqArr['wpEdittime'] = $articleObj->getTimestamp();
+			$requestArray['wpEdittime'] = $articleObj->getTimestamp();
 		}
 
 		if ( !is_null( $params['starttimestamp'] ) && $params['starttimestamp'] != '' ) {
-			$reqArr['wpStarttime'] = wfTimestamp( TS_MW, $params['starttimestamp'] );
+			$requestArray['wpStarttime'] = wfTimestamp( TS_MW, $params['starttimestamp'] );
 		} else {
-			$reqArr['wpStarttime'] = wfTimestampNow();	// Fake wpStartime
+			$requestArray['wpStarttime'] = wfTimestampNow();	// Fake wpStartime
 		}
 
-		if ( $params['minor'] || ( !$params['notminor'] && $wgUser->getOption( 'minordefault' ) ) )	{
-			$reqArr['wpMinoredit'] = '';
+		if ( $params['minor'] || ( !$params['notminor'] && $user->getOption( 'minordefault' ) ) )	{
+			$requestArray['wpMinoredit'] = '';
 		}
 
 		if ( $params['recreate'] ) {
-			$reqArr['wpRecreate'] = '';
+			$requestArray['wpRecreate'] = '';
 		}
 
 		if ( !is_null( $params['section'] ) ) {
@@ -220,9 +213,9 @@ class ApiEditPage extends ApiBase {
 			if ( $section == 0 && $params['section'] != '0' && $params['section'] != 'new' ) {
 				$this->dieUsage( "The section parameter must be set to an integer or 'new'", "invalidsection" );
 			}
-			$reqArr['wpSection'] = $params['section'];
+			$requestArray['wpSection'] = $params['section'];
 		} else {
-			$reqArr['wpSection'] = '';
+			$requestArray['wpSection'] = '';
 		}
 
 		$watch = $this->getWatchlistValue( $params['watchlist'], $titleObj );
@@ -235,22 +228,23 @@ class ApiEditPage extends ApiBase {
 		}
 
 		if ( $watch ) {
-			$reqArr['wpWatchthis'] = '';
+			$requestArray['wpWatchthis'] = '';
 		}
 
-		$req = new FauxRequest( $reqArr, true );
+		global $wgTitle, $wgRequest;
+
+		$req = new DerivativeRequest( $this->getRequest(), $requestArray, true );
+
+		// Some functions depend on $wgTitle == $ep->mTitle
+		// TODO: Make them not or check if they still do
+		$wgTitle = $titleObj;
+
+		$ep = new EditPage( $articleObj );
+		$ep->setContextTitle( $titleObj );
 		$ep->importFormData( $req );
 
 		// Run hooks
-		// Handle CAPTCHA parameters
-		global $wgRequest;
-		if ( !is_null( $params['captchaid'] ) ) {
-			$wgRequest->setVal( 'wpCaptchaId', $params['captchaid'] );
-		}
-		if ( !is_null( $params['captchaword'] ) ) {
-			$wgRequest->setVal( 'wpCaptchaWord', $params['captchaword'] );
-		}
-
+		// Handle APIEditBeforeSave parameters
 		$r = array();
 		if ( !wfRunHooks( 'APIEditBeforeSave', array( $ep, $ep->textbox1, &$r ) ) ) {
 			if ( count( $r ) ) {
@@ -270,7 +264,7 @@ class ApiEditPage extends ApiBase {
 		$oldRequest = $wgRequest;
 		$wgRequest = $req;
 
-		$status = $ep->internalAttemptSave( $result, $wgUser->isAllowed( 'bot' ) && $params['bot'] );
+		$status = $ep->internalAttemptSave( $result, $user->isAllowed( 'bot' ) && $params['bot'] );
 		$wgRequest = $oldRequest;
 		global $wgMaxArticleSize;
 
@@ -333,19 +327,14 @@ class ApiEditPage extends ApiBase {
 				$r['result'] = 'Success';
 				$r['pageid'] = intval( $titleObj->getArticleID() );
 				$r['title'] = $titleObj->getPrefixedText();
-				// HACK: We create a new Article object here because getRevIdFetched()
-				// refuses to be run twice, and because Title::getLatestRevId()
-				// won't fetch from the master unless we select for update, which we
-				// don't want to do.
-				$newArticle = new Article( $titleObj );
-				$newRevId = $newArticle->getRevIdFetched();
+				$newRevId = $articleObj->getLatest();
 				if ( $newRevId == $oldRevId ) {
 					$r['nochange'] = '';
 				} else {
 					$r['oldrevid'] = intval( $oldRevId );
 					$r['newrevid'] = intval( $newRevId );
 					$r['newtimestamp'] = wfTimestamp( TS_ISO_8601,
-						$newArticle->getTimestamp() );
+						$articleObj->getTimestamp() );
 				}
 				break;
 
@@ -358,7 +347,11 @@ class ApiEditPage extends ApiBase {
 				$this->dieUsageMsg( $errors[0] ); // TODO: Add new errors to message map
 				break;
 			default:
-				$this->dieUsageMsg( array( 'unknownerror', $status->value ) );
+				if ( is_string( $status->value ) && strlen( $status->value ) ) {
+					$this->dieUsage( "An unknown return value was returned by Editpage. The code returned was \"{$status->value}\"" , $status->value );
+				} else {
+					$this->dieUsageMsg( array( 'unknownerror', $status->value ) );
+				}
 		}
 		$apiResult->addValue( null, $this->getModuleName(), $r );
 	}
@@ -371,7 +364,7 @@ class ApiEditPage extends ApiBase {
 		return true;
 	}
 
-	protected function getDescription() {
+	public function getDescription() {
 		return 'Create and edit pages.';
 	}
 
@@ -412,13 +405,17 @@ class ApiEditPage extends ApiBase {
 		) );
 	}
 
-	protected function getAllowedParams() {
+	public function getAllowedParams() {
 		return array(
 			'title' => array(
 				ApiBase::PARAM_TYPE => 'string',
 				ApiBase::PARAM_REQUIRED => true
 			),
 			'section' => null,
+			'sectiontitle' => array(
+				ApiBase::PARAM_TYPE => 'string',
+				ApiBase::PARAM_REQUIRED => false,
+			),
 			'text' => null,
 			'token' => null,
 			'summary' => null,
@@ -430,8 +427,6 @@ class ApiEditPage extends ApiBase {
 			'recreate' => false,
 			'createonly' => false,
 			'nocreate' => false,
-			'captchaword' => null,
-			'captchaid' => null,
 			'watch' => array(
 				ApiBase::PARAM_DFLT => false,
 				ApiBase::PARAM_DEPRECATED => true,
@@ -465,11 +460,12 @@ class ApiEditPage extends ApiBase {
 		);
 	}
 
-	protected function getParamDescription() {
+	public function getParamDescription() {
 		$p = $this->getModulePrefix();
 		return array(
 			'title' => 'Page title',
 			'section' => 'Section number. 0 for the top section, \'new\' for a new section',
+			'sectiontitle' => 'The title for a new section',
 			'text' => 'Page content',
 			'token' => array( 'Edit token. You can get one of these through prop=info.',
 						'The token should always be sent as the last parameter, or at least, after the text parameter'
@@ -490,10 +486,8 @@ class ApiEditPage extends ApiBase {
 			'watch' => 'Add the page to your watchlist',
 			'unwatch' => 'Remove the page from your watchlist',
 			'watchlist' => 'Unconditionally add or remove the page from your watchlist, use preferences or do not change watch',
-			'captchaid' => 'CAPTCHA ID from previous request',
-			'captchaword' => 'Answer to the CAPTCHA',
 			'md5' => array(	"The MD5 hash of the {$p}text parameter, or the {$p}prependtext and {$p}appendtext parameters concatenated.",
-				 	'If set, the edit won\'t be done unless the hash is correct' ),
+					'If set, the edit won\'t be done unless the hash is correct' ),
 			'prependtext' => "Add this text to the beginning of the page. Overrides {$p}text",
 			'appendtext' => "Add this text to the end of the page. Overrides {$p}text",
 			'undo' => "Undo this revision. Overrides {$p}text, {$p}prependtext and {$p}appendtext",
@@ -510,14 +504,16 @@ class ApiEditPage extends ApiBase {
 		return '';
 	}
 
-	protected function getExamples() {
+	public function getExamples() {
 		return array(
-			'Edit a page (anonymous user):',
-			'    api.php?action=edit&title=Test&summary=test%20summary&text=article%20content&basetimestamp=20070824123454&token=%2B\\',
-			'Prepend __NOTOC__ to a page (anonymous user):',
-			'    api.php?action=edit&title=Test&summary=NOTOC&minor=&prependtext=__NOTOC__%0A&basetimestamp=20070824123454&token=%2B\\',
-			'Undo r13579 through r13585 with autosummary (anonymous user):',
-			'    api.php?action=edit&title=Test&undo=13585&undoafter=13579&basetimestamp=20070824123454&token=%2B\\',
+
+			'api.php?action=edit&title=Test&summary=test%20summary&text=article%20content&basetimestamp=20070824123454&token=%2B\\'
+				=> 'Edit a page (anonymous user)',
+
+			'api.php?action=edit&title=Test&summary=NOTOC&minor=&prependtext=__NOTOC__%0A&basetimestamp=20070824123454&token=%2B\\'
+				=> 'Prepend __NOTOC__ to a page (anonymous user)',
+			'api.php?action=edit&title=Test&undo=13585&undoafter=13579&basetimestamp=20070824123454&token=%2B\\'
+				=> 'Undo r13579 through r13585 with autosummary (anonymous user)',
 		);
 	}