Reedy has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/312090 )
Change subject: Remove WikiPage::doEdit() call
..
Remove WikiPage::doEdit() call
Bug: T145736
Change-Id: I5616554ff6752eb80e8513d29483d0f1e474a37f
---
M SubPageList.php
M tests/System/SubPageList/PageCreator.php
2 files changed, 9 insertions(+), 14 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
diff --git a/SubPageList.php b/SubPageList.php
index 477e5b9..52b8b1f 100644
--- a/SubPageList.php
+++ b/SubPageList.php
@@ -23,11 +23,6 @@
include_once( __DIR__ . '/vendor/autoload.php' );
}
-// Only initialize the extension when all dependencies are present.
-if ( !defined( 'ParserHooks_VERSION' ) ) {
- throw new Exception( 'You need to have ParserHooks installed in order
to use SubPageList' );
-}
-
call_user_func( function() {
$GLOBALS['wgExtensionCredits']['parserhook'][] = array(
'path' => __FILE__,
@@ -45,6 +40,11 @@
$GLOBALS['wgExtensionMessagesFiles']['SubPageListMagic'] = __DIR__ .
'/SubPageList.i18n.magic.php';
$GLOBALS['wgExtensionFunctions'][] = function() {
+ // Only initialize the extension when all dependencies are
present.
+ if ( !defined( 'ParserHooks_VERSION' ) ) {
+ throw new Exception( 'You need to have ParserHooks
installed in order to use SubPageList' );
+ }
+
global $wgHooks;
$extension = new \SubPageList\Extension(
\SubPageList\Settings::newFromGlobals( $GLOBALS ) );
diff --git a/tests/System/SubPageList/PageCreator.php
b/tests/System/SubPageList/PageCreator.php
index e6eb27a..e22d453 100644
--- a/tests/System/SubPageList/PageCreator.php
+++ b/tests/System/SubPageList/PageCreator.php
@@ -12,15 +12,10 @@
$pageContent = 'Content of ' . $title->getFullText();
$editMessage = 'SPL system test: create page';
- if ( class_exists( 'WikitextContent' ) ) {
- $page->doEditContent(
- new \WikitextContent( $pageContent ),
- $editMessage
- );
- }
- else {
- $page->doEdit( $pageContent, $editMessage );
- }
+ $page->doEditContent(
+ new \WikitextContent( $pageContent ),
+ $editMessage
+ );
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/312090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5616554ff6752eb80e8513d29483d0f1e474a37f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/SubPageList
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
