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
path: root/core
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2019-12-08 06:52:31 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2019-12-08 06:52:31 +0300
commit4570111a71cb989215113d1e6d61cd8b35ad7836 (patch)
treeabab00e0dd72530a275c32f33dea8d136bdd734d /core
parenta14d5041b5c16ce96178f06113de462e5f45207a (diff)
Update Controller.php (#15228)
fix DEV-1827 Needed because otherwise the sites selector shows otherwise undefined as site name when https://github.com/matomo-org/plugin-CustomDimensions/pull/136/files is merged
Diffstat (limited to 'core')
-rw-r--r--core/Plugin/Controller.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 176a040dc7..2bc6a5c2f3 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -753,6 +753,10 @@ abstract class Controller
$view->relativePluginWebDirs = (object) $pluginManager->getWebRootDirectoriesForCustomPluginDirs();
$view->isMultiSitesEnabled = Manager::getInstance()->isPluginActivated('MultiSites');
+ if (isset($this->site) && is_object($this->site) && $this->site instanceof Site) {
+ $view->siteName = $this->site->getName();
+ }
+
self::setHostValidationVariablesView($view);
}