Yaron Koren has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395002 )
Change subject: Updated Semantic Forms support to Page Forms ...................................................................... Updated Semantic Forms support to Page Forms Change-Id: If763fb4ae2a0229393277944d4549d6c1a10aa88 --- M ApprovedRevs.hooks.php M ApprovedRevs.php 2 files changed, 6 insertions(+), 10 deletions(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php index 6791533..56fec24 100644 --- a/ApprovedRevs.hooks.php +++ b/ApprovedRevs.hooks.php @@ -173,7 +173,7 @@ return true; } - if ( ! ApprovedRevs::pageIsApprovable( $title ) ) { + if ( ! ApprovedRevs::pageIsApprovable( $title ) ) { return true; } @@ -514,16 +514,12 @@ } /** - * Same as addWarningToEditPage(), but for the Semantic Foms + * Same as addWarningToEditPage(), but for the Page Forms * 'edit with form' tab. */ - public static function addWarningToSFForm( &$pageName, &$preFormHTML ) { - // The title could be obtained via $pageName in theory - the - // problem is that, pre-SF 2.0.2, that variable wasn't set - // correctly. - global $wgTitle; - $approvedRevID = ApprovedRevs::getApprovedRevID( $wgTitle ); - $latestRevID = $wgTitle->getLatestRevID(); + public static function addWarningToPFForm( &$title, &$preFormHTML ) { + $approvedRevID = ApprovedRevs::getApprovedRevID( $title ); + $latestRevID = $title->getLatestRevID(); if ( ! empty( $approvedRevID ) && $approvedRevID != $latestRevID ) { ApprovedRevs::addCSS(); $preFormHTML .= Xml::element ( 'p', diff --git a/ApprovedRevs.php b/ApprovedRevs.php index faf2db0..250a919 100644 --- a/ApprovedRevs.php +++ b/ApprovedRevs.php @@ -68,7 +68,7 @@ $wgHooks['AdminLinks'][] = 'ApprovedRevsHooks::addToAdminLinks'; $wgHooks['LoadExtensionSchemaUpdates'][] = 'ApprovedRevsHooks::describeDBSchema'; $wgHooks['EditPage::showEditForm:initial'][] = 'ApprovedRevsHooks::addWarningToEditPage'; -$wgHooks['sfHTMLBeforeForm'][] = 'ApprovedRevsHooks::addWarningToSFForm'; +$wgHooks['PageForms::HTMLBeforeForm'][] = 'ApprovedRevsHooks::addWarningToPFForm'; $wgHooks['ArticleViewHeader'][] = 'ApprovedRevsHooks::setArticleHeader'; $wgHooks['ArticleViewHeader'][] = 'ApprovedRevsHooks::displayNotApprovedHeader'; $wgHooks['OutputPageBodyAttributes'][] = 'ApprovedRevsHooks::addBodyClass'; -- To view, visit https://gerrit.wikimedia.org/r/395002 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If763fb4ae2a0229393277944d4549d6c1a10aa88 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/ApprovedRevs Gerrit-Branch: master Gerrit-Owner: Yaron Koren <yaro...@gmail.com> Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits