Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317834
Change subject: More removal of support for MW 1.20
......................................................................
More removal of support for MW 1.20
Change-Id: I9057b3e7d03b590b1af74539801d38273e00b5d6
---
M includes/PF_AutoeditAPI.php
M includes/PF_CreatePageJob.php
2 files changed, 12 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/34/317834/2
diff --git a/includes/PF_AutoeditAPI.php b/includes/PF_AutoeditAPI.php
index 36824b1..33d9811 100644
--- a/includes/PF_AutoeditAPI.php
+++ b/includes/PF_AutoeditAPI.php
@@ -303,12 +303,7 @@
$this->logMessage( 'Form ' . $this->mOptions['form'] .
' is a redirect. Finding target.', self::DEBUG );
$formWikiPage = WikiPage::factory( $formTitle );
- if ( method_exists( $formWikiPage, 'getContent' ) ) {
- // MW 1.21+
- $formTitle = $formWikiPage->getContent(
Revision::RAW )->getUltimateRedirectTarget();
- } else {
- $formTitle = Title::newFromRedirectRecurse(
$formWikiPage->getRawText() );
- }
+ $formTitle = $formWikiPage->getContent( Revision::RAW
)->getUltimateRedirectTarget();
// if we exeeded $wgMaxRedirects or encountered an
invalid redirect target, give up
if ( $formTitle->isRedirect() ) {
@@ -502,13 +497,10 @@
$this->logMessage( 'Article update aborted by a
hook function', self::DEBUG );
return false; // success
- // TODO: This error code only exists from 1.21 onwards.
It is
- // suitably handled by the default branch, but really
should get its
- // own branch. Uncomment once compatibility to pre1.21
is dropped.
-// case EditPage::AS_PARSE_ERROR: // can't parse content
-//
-// throw new MWException( $status->getHTML() );
-// return true; // fail
+ case EditPage::AS_PARSE_ERROR: // Can't parse content
+
+ throw new MWException( $status->getHTML() );
+ return true; // fail
case EditPage::AS_SUCCESS_NEW_ARTICLE: // Article
successfully created
@@ -769,16 +761,11 @@
}
/**
- * Helper function, for backwards compatibility.
+ * Helper function..
*/
function getTextForPage( $title ) {
$wikiPage = WikiPage::factory( $title );
- if ( method_exists( $wikiPage, 'getContent' ) ) {
- // MW 1.21+
- return $wikiPage->getContent( Revision::RAW
)->getNativeData();
- } else {
- return $wikiPage->getRawText();
- }
+ return $wikiPage->getContent( Revision::RAW )->getNativeData();
}
/**
diff --git a/includes/PF_CreatePageJob.php b/includes/PF_CreatePageJob.php
index 9227fb3..72683cf 100644
--- a/includes/PF_CreatePageJob.php
+++ b/includes/PF_CreatePageJob.php
@@ -28,21 +28,11 @@
return false;
}
- if ( method_exists( 'WikiPage', 'doEditContent' ) ) {
- // MW 1.21+
- $wikiPage = new WikiPage( $this->title );
- if ( !$wikiPage ) {
- $this->error = 'createPage: Wiki page not found
"' . $this->title->getPrefixedDBkey() . '"';
- wfProfileOut( __METHOD__ );
- return false;
- }
- } else {
- $article = new Article( $this->title, 0 );
- if ( !$article ) {
- $this->error = 'createPage: Article not found
"' . $this->title->getPrefixedDBkey() . '"';
- wfProfileOut( __METHOD__ );
- return false;
- }
+ $wikiPage = new WikiPage( $this->title );
+ if ( !$wikiPage ) {
+ $this->error = 'createPage: Wiki page not found "' .
$this->title->getPrefixedDBkey() . '"';
+ wfProfileOut( __METHOD__ );
+ return false;
}
$page_text = $this->params['page_text'];
--
To view, visit https://gerrit.wikimedia.org/r/317834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9057b3e7d03b590b1af74539801d38273e00b5d6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
