jenkins-bot has submitted this change and it was merged.
Change subject: Revert timeline to manifest_version 1
......................................................................
Revert timeline to manifest_version 1
Bug: T149759
Change-Id: I8e9635b578fad2bff201a2b283ad170ed1786cd2
---
M Timeline.body.php
M extension.json
2 files changed, 15 insertions(+), 20 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Timeline.body.php b/Timeline.body.php
index 29a7e33..c695495 100644
--- a/Timeline.body.php
+++ b/Timeline.body.php
@@ -3,6 +3,13 @@
class Timeline {
+ public static function onRegistration() {
+ global $wgTimelineFile;
+ if ( $wgTimelineFile === null ) {
+ $wgTimelineFile = __DIR__ . '/EasyTimeline.pl';
+ }
+ }
+
/**
* @param $parser Parser
* @return bool
diff --git a/extension.json b/extension.json
index 2ac124a..8d89c3e 100644
--- a/extension.json
+++ b/extension.json
@@ -5,6 +5,7 @@
"descriptionmsg": "timeline-desc",
"license-name": "GPL-2.0",
"type": "parserhook",
+ "callback": "Timeline::onRegistration",
"MessagesDirs": {
"Timeline": [
"i18n"
@@ -33,25 +34,12 @@
"ParserFirstCallInit": "Timeline::onParserFirstCallInit"
},
"config": {
- "TimelinePloticusCommand": {
- "value": "/usr/bin/ploticus"
- },
- "TimelinePerlCommand": {
- "value": "/usr/bin/perl"
- },
- "TimelineFile": {
- "value": "EasyTimeline.pl",
- "path": true
- },
- "TimelineEpochTimestamp": {
- "value": "20120101000000"
- },
- "TimelineFontFile": {
- "value": "FreeSans"
- },
- "TimelineFileBackend": {
- "value": ""
- }
+ "TimelinePloticusCommand": "/usr/bin/ploticus",
+ "TimelinePerlCommand": "/usr/bin/perl",
+ "TimelineFile": null,
+ "TimelineEpochTimestamp": "20120101000000",
+ "TimelineFontFile": "FreeSans",
+ "TimelineFileBackend": ""
},
- "manifest_version": 2
+ "manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/319703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e9635b578fad2bff201a2b283ad170ed1786cd2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/timeline
Gerrit-Branch: REL1_28
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
