SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333556 )
Change subject: v2.3 - Remove old compatibility shims ...................................................................... v2.3 - Remove old compatibility shims Change-Id: I60843643703f865894ba0147d215316091880db3 --- D ContactPage.i18n.php D ContactPage.php M extension.json 3 files changed, 1 insertion(+), 51 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContactPage refs/changes/56/333556/1 diff --git a/ContactPage.i18n.php b/ContactPage.i18n.php deleted file mode 100644 index f612195..0000000 --- a/ContactPage.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * This is a backwards-compatibility shim, generated by: - * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim374f30f45ca7c395' ) ) { - function wfJsonI18nShim374f30f45ca7c395( $cache, $code, &$cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json"; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim374f30f45ca7c395'; -} diff --git a/ContactPage.php b/ContactPage.php deleted file mode 100644 index aac62f7..0000000 --- a/ContactPage.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php - -if ( function_exists( 'wfLoadExtension' ) ) { - wfLoadExtension( 'ContactPage' ); - // Keep i18n globals so mergeMessageFileList.php doesn't break - $wgMessagesDirs['ContactPage'] = __DIR__ . '/i18n'; - $wgExtensionMessagesFiles['ContactPageAliases'] = __DIR__ . '/ContactPage.alias.php'; - wfWarn( - 'Deprecated PHP entry point used for ContactPage extension. Please use wfLoadExtension instead, ' . - 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' - ); - return; -} else { - die( 'This version of the ContactPage extension requires MediaWiki 1.25+' ); -} diff --git a/extension.json b/extension.json index 809068a..89a16fa 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "ContactPage", - "version": "2.2", + "version": "2.3", "author": [ "Daniel Kinzler", "Sam Reed" -- To view, visit https://gerrit.wikimedia.org/r/333556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60843643703f865894ba0147d215316091880db3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContactPage Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
