jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327010 )
Change subject: Replace "Article::doEdit()" deprecated in MediaWiki 1.21
......................................................................
Replace "Article::doEdit()" deprecated in MediaWiki 1.21
* SPM_WFAjaxAccess
* SPM_WidgetUtils
* SPM_WidgetAssembler
* SPM_WidgetClone
* SPM_ObjectEditor
Bug: T151973
Change-Id: Ibb28fc6cfad82d36d67eb1ff46b469ba00831d6c
---
M includes/widgets/SPM_WFAjaxAccess.php
M includes/widgets/SPM_WidgetUtils.php
M specials/WidgetAssembler/SPM_WidgetAssembler.php
M specials/WidgetClone/SPM_WidgetClone.php
M specials/WikiObjectEditor/SPM_ObjectEditor.php
5 files changed, 64 insertions(+), 24 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/widgets/SPM_WFAjaxAccess.php
b/includes/widgets/SPM_WFAjaxAccess.php
index e73d21b..56e8dcd 100644
--- a/includes/widgets/SPM_WFAjaxAccess.php
+++ b/includes/widgets/SPM_WFAjaxAccess.php
@@ -143,8 +143,11 @@
$text = $dt->getPropertyWiki( $params );
$title = Title::newFromText( $title . '/' . $name,
SMW_NS_PROPERTY );
- $article = new Article( $title );
- $ret = $article->doEdit( $text, 'Edit by Widget Designer' );
+ $page = WikiPage::factory( $title );
+ $ret = $page->doEditContent(
+ ContentHandler::makeContent( $text, $title ),
+ 'Edit by Widget Designer'
+ );
return wfMessage( 'spm_ajax_success' )->text();
} elseif ( $method == "resetPropertyDefinition" ) {
@@ -172,8 +175,13 @@
// revert
$summary = wfMessage( 'revertpage',
$revision->getUserText(), $wgUser->getName() )->text();
- $article = new Article( $revision->getTitle() );
- $status = $article->doEdit( $revision->getText(),
$summary, 0, $rid );
+ $page = WikiPage::factory( $revision->getTitle() );
+ $status = $page->doEditContent(
+ ContentHandler::makeContent(
$revision->getText(), $revision->getTitle() ),
+ $summary,
+ 0,
+ $rid
+ );
}
return wfMessage( 'spm_ajax_success' )->text();
} elseif ( $method == "refreshPropertyRevision" ) {
@@ -220,8 +228,11 @@
$title = Title::newFromText( $name, NS_TEMPLATE );
// decode error, just deal this in client js
// $text = html_entity_decode( $text );
- $article = new Article( $title );
- $ret = $article->doEdit( $text, 'Edit by Widget Designer' );
+ $page = WikiPage::factory( $title );
+ $ret = $page->doEditContent(
+ ContentHandler::makeContent( $text, $title ),
+ 'Edit by Widget Designer'
+ );
if ( !$ret->isOK() ) {
return $ret->getWikiText();
}
@@ -246,8 +257,11 @@
$revision = Revision::newFromTitle( $title );
if ( $revision != null ) $text .= $revision->getText();
- $article = new Article( $title );
- $ret = $article->doEdit( $text, 'Edit by Widget
Designer' );
+ $page = WikiPage::factory( $title );
+ $ret = $page->doEditContent(
+ ContentHandler::makeContent( $text, $title ),
+ 'Edit by Widget Designer'
+ );
if ( !$ret->isOK() ) {
return $ret->getWikiText();
}
@@ -359,8 +373,11 @@
$title = Title::newFromText( $widget_name,
SF_NS_FORM );
- $article = new Article( $title );
- $ret = $article->doEdit( $form_text, 'Edit by
Widget Designer' );
+ $page = WikiPage::factory( $title );
+ $ret = $page->doEditContent(
+ ContentHandler::makeContent(
$form_text, $title ),
+ 'Edit by Widget Designer'
+ );
if ( $ret->isOK() ) {
$ret = 1;
$msg = $title->getFullURL();
diff --git a/includes/widgets/SPM_WidgetUtils.php
b/includes/widgets/SPM_WidgetUtils.php
index 720fb54..f4b3407 100644
--- a/includes/widgets/SPM_WidgetUtils.php
+++ b/includes/widgets/SPM_WidgetUtils.php
@@ -1021,8 +1021,11 @@
}
$wom->appendChildObject( new WOMTextModel( $pf_text ) );
- $article = new Article( $title );
- $ret = $article->doEdit( $wom->getWikiText(), 'Edit by Widget
Connector Designer' );
+ $page = WikiPage::factory( $title );
+ $ret = $page->doEditContent(
+ ContentHandler::makeContent( $wom->getWikiText(),
$title ),
+ 'Edit by Widget Connector Designer'
+ );
if ( !$ret->isOK() ) {
return $ret->getWikiText();
}
diff --git a/specials/WidgetAssembler/SPM_WidgetAssembler.php
b/specials/WidgetAssembler/SPM_WidgetAssembler.php
index 38ce2d8..0530991 100644
--- a/specials/WidgetAssembler/SPM_WidgetAssembler.php
+++ b/specials/WidgetAssembler/SPM_WidgetAssembler.php
@@ -141,8 +141,11 @@
<div align="center"> Saving ... </div>
';
// save to wiki
- $article = new Article( $page_obj->getTitle() );
- $article->doEdit( $page_obj->getWikiText(), '' );
+ $page = WikiPage::factory( $page_obj->getTitle() );
+ $page->doEditContent(
+ ContentHandler::makeContent( $page_obj->getWikiText(),
$page_obj->getTitle() ),
+ ''
+ );
print '
<script type="text/javascript">
diff --git a/specials/WidgetClone/SPM_WidgetClone.php
b/specials/WidgetClone/SPM_WidgetClone.php
index 7680efc..1c075b3 100644
--- a/specials/WidgetClone/SPM_WidgetClone.php
+++ b/specials/WidgetClone/SPM_WidgetClone.php
@@ -109,8 +109,11 @@
// save to wiki
$content = "'''Created by Semantic Page Maker.'''\n" . (
$parent ? "[[Category:{$parent}]]" : '' );
$c_title = Title::newFromText( $targetWidget, NS_CATEGORY );
- $article = new Article( $c_title );
- $article->doEdit( $content, $summary );
+ $page = WikiPage::factory( $c_title );
+ $page->doEditContent(
+ ContentHandler::makeContent( $content, $c_title ),
+ $summary
+ );
$content = '';
$t_title = Title::newFromText( $targetWidget, NS_TEMPLATE );
@@ -158,8 +161,11 @@
$ps = explode( '/',
$prop_name, 2 );
$new_prop_name =
$targetWidget . '/' . $ps[1];
$p_title =
Title::newFromText( $new_prop_name, SMW_NS_PROPERTY );
- $article = new Article(
$p_title );
- $article->doEdit(
$p_content, $summary );
+ $page =
WikiPage::factory( $p_title );
+ $page->doEditContent(
+
ContentHandler::makeContent( $p_content, $p_title ),
+ $summary
+ );
$tmpl['fields'][1] =
$new_prop_name;
}
@@ -168,8 +174,11 @@
}
}
}
- $article = new Article( $t_title );
- $article->doEdit( $content, $summary );
+ $page = WikiPage::factory( $t_title );
+ $page->doEditContent(
+ ContentHandler::makeContent( $content, $t_title ),
+ $summary
+ );
$smwdatatype = SMWPropertyValue::makeProperty( '___SPM_WF_ST' );
$content = "[[{$smwdatatype->getWikiValue()}::" .
SPMWidgetUtils::getTitlePrefixedText( $t_title ) . "| ]]\n";
@@ -186,8 +195,11 @@
}
}
$w_title = Title::newFromText( $targetWidget,
NS_CATEGORY_WIDGET );
- $article = new Article( $w_title );
- $article->doEdit( $content, $summary );
+ $page = WikiPage::factory( $w_title );
+ $page->doEditContent(
+ ContentHandler::makeContent( $content, $w_title ),
+ $summary
+ );
print '
<script type="text/javascript">
diff --git a/specials/WikiObjectEditor/SPM_ObjectEditor.php
b/specials/WikiObjectEditor/SPM_ObjectEditor.php
index e3c3ea7..861ccad 100644
--- a/specials/WikiObjectEditor/SPM_ObjectEditor.php
+++ b/specials/WikiObjectEditor/SPM_ObjectEditor.php
@@ -112,8 +112,13 @@
<div align="center"> Saving ... </div>
';
// save to wiki
- $article = new Article( $wom->getTitle() );
- $article->doEdit( $wom->getWikiText(), '', 0, $rid );
+ $page = WikiPage::factory( $wom->getTitle() );
+ $page->doEditContent(
+ ContentHandler::makeContent( $wom->getWikiText(),
$wom->getTitle() ),
+ '',
+ 0,
+ $rid
+ );
print '
<script type="text/javascript">
--
To view, visit https://gerrit.wikimedia.org/r/327010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb28fc6cfad82d36d67eb1ff46b469ba00831d6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticPageMaker
Gerrit-Branch: master
Gerrit-Owner: Divadsn <divad.nnamtd...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
