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:
authormattpiwik <matthieu.aubry@gmail.com>2011-10-18 12:22:34 +0400
committermattpiwik <matthieu.aubry@gmail.com>2011-10-18 12:22:34 +0400
commit633b80c8549740e3e1b46845552f7543d887615a (patch)
tree3483f5e86dd583624803e709d0858f3fef3965a9
parent131d09124e236cfb5b8a707a7ed699a5a1cb2ef5 (diff)
fixing dashboard for new users1.6
git-svn-id: http://dev.piwik.org/svn/trunk@5327 59fd770c-687e-43c8-a1e3-f5a4ff64c105
-rw-r--r--plugins/Dashboard/Controller.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
index 639f279a74..670de08245 100644
--- a/plugins/Dashboard/Controller.php
+++ b/plugins/Dashboard/Controller.php
@@ -127,12 +127,14 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
{
$layout = $this->getLayoutForUser(Piwik::getCurrentUserLogin(),$idDashboard);
}
+ if(!empty($layout))
+ {
+ // layout was JSON.stringified
+ $layout = html_entity_decode($layout);
+ $layout = str_replace("\\\"", "\"", $layout);
- // layout was JSON.stringified
- $layout = html_entity_decode($layout);
- $layout = str_replace("\\\"", "\"", $layout);
-
- $layout = $this->removeDisabledPluginFromLayout($layout);
+ $layout = $this->removeDisabledPluginFromLayout($layout);
+ }
return $layout;
}