Filip has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326160 )
Change subject: Removed deprecated "Article::fetchContent()"
......................................................................
Removed deprecated "Article::fetchContent()"
Removed "Article::fetchContent()" deprecated in MediaWiki 1.21
Bug: T151973
Change-Id: Ie96b0b2a60b36edce8def957280763e6fb66cebc
---
M ReplaceTextJob.php
1 file changed, 22 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText
refs/changes/60/326160/1
diff --git a/ReplaceTextJob.php b/ReplaceTextJob.php
index 9d6ba0e..fead3fe 100644
--- a/ReplaceTextJob.php
+++ b/ReplaceTextJob.php
@@ -54,39 +54,29 @@
$wgUser = $actual_user;
} else {
// WikiPage::getContent() replaced
- // Article::fetchContent() starting in MW 1.21.
- if ( method_exists( 'WikiPage', 'getContent' ) ) {
- if ( $this->title->getContentModel() !==
CONTENT_MODEL_WIKITEXT ) {
- $this->error = 'replaceText: Wiki page
"' .
-
$this->title->getPrefixedDBkey() . '" does not hold regular wikitext.';
- wfProfileOut( __METHOD__ );
- return false;
- }
- $wikiPage = new WikiPage( $this->title );
- // Is this check necessary?
- if ( !$wikiPage ) {
- $this->error =
- 'replaceText: Wiki page not
found for "' . $this->title->getPrefixedDBkey() . '."';
- wfProfileOut( __METHOD__ );
- return false;
- }
- $wikiPageContent = $wikiPage->getContent();
- if ( is_null( $wikiPageContent ) ) {
- $this->error =
- 'replaceText: No contents found
for wiki page at "' . $this->title->getPrefixedDBkey() . '."';
- wfProfileOut( __METHOD__ );
- return false;
- }
- $article_text =
$wikiPageContent->getNativeData();
- } else {
- $article = new Article( $this->title, 0 );
- if ( !$article ) {
- $this->error = 'replaceText: Article
not found for "' . $this->title->getPrefixedDBkey() . '"';
- wfProfileOut( __METHOD__ );
- return false;
- }
- $article_text = $article->fetchContent();
+ // Removed Article::fetchContent()
+ if ( $this->title->getContentModel() !==
CONTENT_MODEL_WIKITEXT ) {
+ $this->error = 'replaceText: Wiki page "' .
+ $this->title->getPrefixedDBkey() . '"
does not hold regular wikitext.';
+ wfProfileOut( __METHOD__ );
+ return false;
}
+ $wikiPage = new WikiPage( $this->title );
+ // Is this check necessary?
+ if ( !$wikiPage ) {
+ $this->error =
+ 'replaceText: Wiki page not found for
"' . $this->title->getPrefixedDBkey() . '."';
+ wfProfileOut( __METHOD__ );
+ return false;
+ }
+ $wikiPageContent = $wikiPage->getContent();
+ if ( is_null( $wikiPageContent ) ) {
+ $this->error =
+ 'replaceText: No contents found for
wiki page at "' . $this->title->getPrefixedDBkey() . '."';
+ wfProfileOut( __METHOD__ );
+ return false;
+ }
+ $article_text = $wikiPageContent->getNativeData();
wfProfileIn( __METHOD__ . '-replace' );
$target_str = $this->params['target_str'];
--
To view, visit https://gerrit.wikimedia.org/r/326160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie96b0b2a60b36edce8def957280763e6fb66cebc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ReplaceText
Gerrit-Branch: master
Gerrit-Owner: Filip <r...@protonmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
