jenkins-bot has submitted this change and it was merged.
Change subject: Switched to JCSingleton::parseContent
......................................................................
Switched to JCSingleton::parseContent
Depends-on: I3abe44380499344c2048c1871f1ea19184a0ec77
Change-Id: Idaa10e301b0fea6409d35ebd24da4a81415c37d8
---
M includes/ApiZeroPortal.php
M includes/PortalSpecialPage.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ApiZeroPortal.php b/includes/ApiZeroPortal.php
index 1aab2f4..b99afb4 100644
--- a/includes/ApiZeroPortal.php
+++ b/includes/ApiZeroPortal.php
@@ -320,7 +320,7 @@
}
foreach ( $page['revisions'] as $rev ) {
/** @var ZeroConfig $content */
- $content =
JCSingleton::getContent( $titleValue, $rev['*'] );
+ $content =
JCSingleton::parseContent( $titleValue, $rev['*'] );
if ( !$content ||
!$content->isValid() ) {
if ( !$hasWarnings ) {
wfLogWarning(
diff --git a/includes/PortalSpecialPage.php b/includes/PortalSpecialPage.php
index 9876c00..3e2f9d1 100644
--- a/includes/PortalSpecialPage.php
+++ b/includes/PortalSpecialPage.php
@@ -216,7 +216,7 @@
return $editData;
}
$jsonText = FormatJson::encode( $mergeData->getData(), false,
FormatJson::ALL_OK );
- $newContent = JCSingleton::getContent( $tv, $jsonText );
+ $newContent = JCSingleton::parseContent( $tv, $jsonText );
if ( !$newContent->getStatus()->isOK() ) {
$editData['error'] = 'zpedit-merge-2';
$editData['msg'] = $newContent->getStatus()->getHTML();
--
To view, visit https://gerrit.wikimedia.org/r/291006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idaa10e301b0fea6409d35ebd24da4a81415c37d8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
