jenkins-bot has submitted this change and it was merged. Change subject: Update for merge into core ......................................................................
Update for merge into core Core change Ie0ab9090 merges the functionality of this extension into core. Add a README file about the deprecation, and add detection into OpenSearchXml.php so the extension doesn't stomp on core. Change-Id: I297e975a2887afb2154372bf029d669e07138746 --- M OpenSearchXml.php A README-deprecated 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/OpenSearchXml.php b/OpenSearchXml.php index 28fcbc9..aa468da 100644 --- a/OpenSearchXml.php +++ b/OpenSearchXml.php @@ -20,6 +20,15 @@ * http://www.gnu.org/copyleft/gpl.html */ +// If core ApiOpenSearch supports XML, do not process this extension. +if ( is_callable( 'ApiOpenSearch::getOpenSearchTemplate' ) ) { + // We need to delay executing the wfWarn because GlobalFunctions.php isn't loaded yet. + $wgExtensionFunctions[] = function () { + wfLogWarning( "Extension:OpenSearchXml is no longer needed with this version of MediaWiki.\n" ); + }; + return; +} + $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'OpenSearchXml', diff --git a/README-deprecated b/README-deprecated new file mode 100644 index 0000000..9a2bf84 --- /dev/null +++ b/README-deprecated @@ -0,0 +1,5 @@ +The functionality of this extension was merged into mediawiki/core +(ApiOpenSearch) in MediaWiki 1.25, Gerrit change Ie0ab9090. + +For extract and page image functionality, the core ApiOpenSearch requires the +TextExtracts and PageImages extensions. -- To view, visit https://gerrit.wikimedia.org/r/171574 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I297e975a2887afb2154372bf029d669e07138746 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenSearchXml Gerrit-Branch: master Gerrit-Owner: Anomie <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
