Divadsn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327264 )
Change subject: Replace "Article::getContent()" deprecated in MediaWiki 1.21
......................................................................
Replace "Article::getContent()" deprecated in MediaWiki 1.21
* DT_ImportJob
* DT_PageStructure
Bug: T151973
Change-Id: If95c372fa9e6e7fbb91b6664198ca81b58cd2d18
---
M includes/DT_ImportJob.php
M includes/DT_PageStructure.php
2 files changed, 18 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataTransfer
refs/changes/64/327264/1
diff --git a/includes/DT_ImportJob.php b/includes/DT_ImportJob.php
index 3bd56c9..fd0ea4f 100644
--- a/includes/DT_ImportJob.php
+++ b/includes/DT_ImportJob.php
@@ -24,21 +24,13 @@
return false;
}
- if ( method_exists( 'WikiPage', 'getContent' ) ) {
- $wikiPage = new WikiPage( $this->title );
- if ( !$wikiPage ) {
- $this->error = 'dtImport: Wiki page not found
"' . $this->title->getPrefixedDBkey() . '"';
- wfProfileOut( __METHOD__ );
- return false;
- }
- } else {
- $article = new Article( $this->title );
- if ( !$article ) {
- $this->error = 'dtImport: Article not found "'
. $this->title->getPrefixedDBkey() . '"';
- wfProfileOut( __METHOD__ );
- return false;
- }
+ $wikiPage = WikiPage::factory( $this->title );
+ if ( !$wikiPage ) {
+ $this->error = 'dtImport: Wiki page not found "' .
$this->title->getPrefixedDBkey() . '"';
+ wfProfileOut( __METHOD__ );
+ return false;
}
+
$for_pages_that_exist = $this->params['for_pages_that_exist'];
if ( $for_pages_that_exist == 'skip' && $this->title->exists()
) {
return true;
@@ -52,12 +44,7 @@
$text = $this->params['text'];
if ( $this->title->exists() ) {
if ( $for_pages_that_exist == 'append' ) {
- if ( method_exists( 'WikiPage', 'getContent' )
) {
- // MW >= 1.21
- $existingText =
$wikiPage->getContent()->getNativeData();
- } else {
- $existingText = $article->getContent();
- }
+ $existingText =
$wikiPage->getContent()->getNativeData();
$text = $existingText . "\n" . $text;
} elseif ( $for_pages_that_exist == 'merge' ) {
$existingPageStructure =
DTPageStructure::newFromTitle( $this->title );
@@ -69,21 +56,17 @@
// otherwise, $for_pages_that_exist == 'overwrite'
}
$edit_summary = $this->params['edit_summary'];
- if ( method_exists( 'WikiPage', 'getContent' ) ) {
- $new_content = new WikitextContent( $text );
- // It's strange that doEditContent() doesn't
- // automatically attach the 'bot' flag when the user
- // is a bot...
- if ( $wgUser->isAllowed( 'bot' ) ) {
- $flags = EDIT_FORCE_BOT;
- } else {
- $flags = 0;
- }
- $wikiPage->doEditContent( $new_content, $edit_summary,
$flags );
-
+ $new_content = new WikitextContent( $text );
+ // It's strange that doEditContent() doesn't
+ // automatically attach the 'bot' flag when the user
+ // is a bot...
+ if ( $wgUser->isAllowed( 'bot' ) ) {
+ $flags = EDIT_FORCE_BOT;
} else {
- $article->doEdit( $text, $edit_summary );
+ $flags = 0;
}
+ $wikiPage->doEditContent( $new_content, $edit_summary, $flags );
+
$wgUser = $actual_user;
wfProfileOut( __METHOD__ );
return true;
diff --git a/includes/DT_PageStructure.php b/includes/DT_PageStructure.php
index f5a91ec..cb8870a 100644
--- a/includes/DT_PageStructure.php
+++ b/includes/DT_PageStructure.php
@@ -148,13 +148,8 @@
$pageStructure = new DTPageStructure();
$pageStructure->mPageTitle = $pageTitle;
- if ( method_exists( 'WikiPage', 'getContent' ) ) {
- $wiki_page = new WikiPage( $pageTitle );
- $page_contents =
$wiki_page->getContent()->getNativeData();
- } else {
- $article = new Article( $pageTitle );
- $page_contents = $article->getContent();
- }
+ $wiki_page = WikiPage::factory( $pageTitle );
+ $page_contents = $wiki_page->getContent()->getNativeData();
$pageStructure->parsePageContents( $page_contents );
--
To view, visit https://gerrit.wikimedia.org/r/327264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If95c372fa9e6e7fbb91b6664198ca81b58cd2d18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataTransfer
Gerrit-Branch: master
Gerrit-Owner: Divadsn <divad.nnamtd...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
