Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2019-08-16 07:12:37 +0300
committerGitHub <noreply@github.com>2019-08-16 07:12:37 +0300
commitd919ba311f0c6a9a57740c6b369648116f71fba7 (patch)
tree8af22643cda5d6c1ab3b1ffcd40ebc8eaf9e473e /plugins/Morpheus
parent48c9f2c676b4178d8526197af0059bdd7a0f6a72 (diff)
Admin controllers do not call setGeneralVariablesView, so we have to … (#14779)
* Admin controllers do not call setGeneralVariablesView, so we have to set the property another way. * fix typo
Diffstat (limited to 'plugins/Morpheus')
-rw-r--r--plugins/Morpheus/templates/_jsGlobalVariables.twig2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/Morpheus/templates/_jsGlobalVariables.twig b/plugins/Morpheus/templates/_jsGlobalVariables.twig
index 2708c1679a..36c03f0eb2 100644
--- a/plugins/Morpheus/templates/_jsGlobalVariables.twig
+++ b/plugins/Morpheus/templates/_jsGlobalVariables.twig
@@ -23,7 +23,9 @@
{% if siteName is defined %}
// NOTE: siteName is currently considered deprecated, use piwik.currentSiteName instead, which will not contain HTML entities
piwik.siteName = "{{ siteName|e('js') }}";
+ {% if siteNameDecoded is defined %} // just to be safe
piwik.currentSiteName = {{ siteNameDecoded|json_encode|raw }};{% endif %}
+ {% endif %}
{% if siteMainUrl is defined %}piwik.siteMainUrl = "{{ siteMainUrl|e('js') }}";{% endif %}