jenkins-bot has submitted this change and it was merged.
Change subject: Revert ZeroBanner to manifest_version 1
......................................................................
Revert ZeroBanner to manifest_version 1
Bug: T149759
Change-Id: I01393d4b6711fcaa6eea8ecf29fd5c19e73dc8d0
---
M extension.json
M includes/PageRenderingHooks.php
2 files changed, 27 insertions(+), 54 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 64248b7..a6a2cc4 100644
--- a/extension.json
+++ b/extension.json
@@ -134,61 +134,29 @@
"SpecialMobileEditWatchlist::images":
"ZeroBanner\\PageRenderingHooks::onSpecialMobileEditWatchlist_images",
"ResourceLoaderTestModules":
"ZeroBanner\\TestHooks::onResourceLoaderTestModules"
},
- "config": {
- "JsonConfigModels": {
- "merge_strategy": "array_replace_recursive",
- "value": {
- "JsonZeroConfig": {
- "class": "ZeroBanner\\ZeroConfig"
- }
- }
- },
- "JsonConfigs": {
- "merge_strategy": "array_replace_recursive",
- "value": {
- "JsonZeroConfig": {
- "namespace": 480,
- "nsName": "Zero",
- "isLocal": false,
- "cacheKey": "1"
- }
- }
- },
- "ZeroSiteOverride": {
- "@note": "false|string[] For testing, overrides
Conf->siteFromDB( DBname )",
- "@note2": "On a test wiki, set it to ['wikipedia','en']
or similar.",
- "@note3": "ZeroBanner explicitly checks for the site to
equal 'wikipedia' before enabling Zero.",
- "value": false
- },
- "ZeroBannerClusterDomain": {
- "@note": "string Temporary workaround - until I figure
out how to calculate it",
- "value": "org"
- },
- "ZeroBannerImageFontSize": {
- "@note": "int size of the font used for the image",
- "value": 14
- },
- "ZeroBannerImageWidth": {
- "@note": "int size of the image banner width",
- "value": 320
- },
- "ZeroBannerImageHeight": {
- "@note": "int size of the image banner width",
- "value": 28
- },
- "ZeroBannerErrImageWidth": {
- "@note": "int size of the error image width",
- "value": 320
- },
- "ZeroBannerErrImageHeight": {
- "@note": "int size of the error image width",
- "value": 200
- },
- "ZeroBannerFont": {
- "value": "unifont/unifont_csur-7.0.03.ttf",
- "path": true
+ "JsonConfigModels": {
+ "JsonZeroConfig": {
+ "class": "ZeroBanner\\ZeroConfig"
}
},
+ "JsonConfigs": {
+ "JsonZeroConfig": {
+ "namespace": 480,
+ "nsName": "Zero",
+ "isLocal": false,
+ "cacheKey": "1"
+ }
+ },
+ "config": {
+ "ZeroSiteOverride": false,
+ "ZeroBannerClusterDomain": "org",
+ "ZeroBannerImageFontSize": 14,
+ "ZeroBannerImageWidth": 320,
+ "ZeroBannerImageHeight": 28,
+ "ZeroBannerErrImageWidth": 320,
+ "ZeroBannerErrImageHeight": 200,
+ "ZeroBannerFont": null
+ },
"load_composer_autoloader": true,
- "manifest_version": 2
+ "manifest_version": 1
}
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 4f501c3..10da373 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -23,6 +23,11 @@
// Define constants but don't add them to the namespace list -
they will be used for external access only
define( 'NS_ZERO', 480 );
define( 'NS_ZERO_TALK', 481 );
+
+ global $wgZeroBannerFont;
+ if ( $wgZeroBannerFont === null ) {
+ $wgZeroBannerFont = dirname( __DIR__ ) .
'/unifont/unifont_csur-7.0.03.ttf';
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/319864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01393d4b6711fcaa6eea8ecf29fd5c19e73dc8d0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: REL1_28
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
