From 034adf1ae3d2bd1e9287916213a41e693c859ff1 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Sat, 13 Oct 2012 03:17:18 +0000
Subject: [PATCH] Refs #1823 * Geolocation menu now appears green when
selected
git-svn-id: http://dev.piwik.org/svn/trunk@7172 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/Controller/Admin.php | 8 ++++++--
plugins/UserCountry/Controller.php | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/core/Controller/Admin.php b/core/Controller/Admin.php
index cc82770598..28be796713 100644
--- a/core/Controller/Admin.php
+++ b/core/Controller/Admin.php
@@ -27,11 +27,15 @@ abstract class Piwik_Controller_Admin extends Piwik_Controller
{
parent::setBasicVariablesView($view);
+ self::setBasicVariablesAdminView($view);
+ }
+
+ static public function setBasicVariablesAdminView($view)
+ {
$view->currentAdminMenuName = Piwik_GetCurrentAdminMenuName();
$view->enableFrames = Piwik_Config::getInstance()->General['enable_framed_settings'];
- if(!$view->enableFrames)
- {
+ if (!$view->enableFrames) {
$view->setXFrameOptions('sameorigin');
}
}
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 5953ccbd9e..a2e2d7495f 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -40,8 +40,9 @@ class Piwik_UserCountry_Controller extends Piwik_Controller
$newline = '<br/>', $includeExtra = true);
$view->currentProviderId = Piwik_UserCountry_LocationProvider::getCurrentProviderId();
$view->thisIP = Piwik_IP::getIpFromHeader();
-
+
$this->setBasicVariablesView($view);
+ Piwik_Controller_Admin::setBasicVariablesAdminView($view);
$view->menu = Piwik_GetAdminMenu();
echo $view->render();
--
GitLab