jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/396092 )
Change subject: GraphViz depends on ImageMap
..
GraphViz depends on ImageMap
Depends-On: 4d3bde030021f3e06f613167148caad74e3e3597
Change-Id: If76f5457de6563b2193f8a2275bd77ce528571fd
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/GraphViz.php
4 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Samwilson: Looks good to me, approved
diff --git a/extension.json b/extension.json
index 7e01f70..45d5d36 100644
--- a/extension.json
+++ b/extension.json
@@ -13,7 +13,10 @@
"descriptionmsg": "graphviz-desc",
"license-name": "GPL-2.0+",
"requires": {
- "MediaWiki": ">= 1.29.0"
+ "MediaWiki": ">= 1.29.0",
+ "extensions": {
+ "ImageMap": "*"
+ }
},
"AutoloadClasses": {
"MediaWiki\\Extension\\GraphViz\\GraphViz":
"includes/GraphViz.php",
diff --git a/i18n/en.json b/i18n/en.json
index 7b35939..10d772f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,7 +8,6 @@
"graphviz-desc": "Allows embedding [http://www.graphviz.org Graphviz]
markup and generates inline images",
"graphviz-reload": "Graph image source changed. Reload page to display
updated graph image.",
"graphviz-no-input": "Graph source is missing.",
- "graphviz-no-imagemap-class": "The ImageMap extension is not
installed.",
"graphviz-dot-invalid-image": "The dot $1 attribute must be the name of
an uploaded file.",
"graphviz-dot-attr-forbidden": "The dot $1 attribute is forbidden.",
"graphviz-read-src-failed": "Unable to read the graph text from the
file system.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 2caf2ec..a8267e8 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,7 +9,6 @@
"graphviz-desc":
"{{desc|name=GraphViz|url=https://www.mediawiki.org/wiki/Extension:Graphviz}};,
"graphviz-reload": "Used as an informational message to inform the user
to reload the wiki page.",
"graphviz-no-input": "Used as error message",
- "graphviz-no-imagemap-class": "Used as error message",
"graphviz-dot-invalid-image": "Used as error message. Parameters:\n*
$1 - attribute name",
"graphviz-dot-attr-forbidden": "Used as an error message.
Parameters:\n* $1 - attribute name",
"graphviz-read-src-failed": "Used as error message.",
diff --git a/includes/GraphViz.php b/includes/GraphViz.php
index 58d97eb..97fcc8b 100644
--- a/includes/GraphViz.php
+++ b/includes/GraphViz.php
@@ -487,11 +487,6 @@
return self::i18nErrorMessageHTML( 'graphviz-no-input'
);
}
- // make sure the ImageMap extension is installed
- if ( !class_exists( 'ImageMap' ) ) {
- return self::i18nErrorMessageHTML(
'graphviz-no-imagemap-class' );
- }
-
// get title text
$title = $parser->getTitle();
$titleText = $title->getFulltext();
--
To view, visit https://gerrit.wikimedia.org/r/396092
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If76f5457de6563b2193f8a2275bd77ce528571fd
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/GraphViz
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Samwilson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
