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>2012-03-08 07:30:12 +0400
committermattpiwik <matthieu.aubry@gmail.com>2012-03-08 07:30:12 +0400
commitfb4d9b650a2e07ee74981bbc7a495aa5d4a0a57a (patch)
tree3460aa55e53cff2194d06daf564a3687c97e431b /plugins/UsersManager
parent4769bbf83f279d3511a98c51d7d2df731a2fe4f0 (diff)
Work around when sites were manually deleted (ie. developers playing around)
git-svn-id: http://dev.piwik.org/svn/trunk@6001 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/Controller.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 106ed4be9c..128f25f838 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -195,7 +195,12 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
foreach($anonymousSitesAccess as $info)
{
$idSite = $info['site'];
- $anonymousSites[$idSite] = Piwik_SitesManager_API::getInstance()->getSiteFromId($idSite);
+ $site = Piwik_SitesManager_API::getInstance()->getSiteFromId($idSite);
+ // Work around manual website deletion
+ if(!empty($site))
+ {
+ $anonymousSites[$idSite] = $site;
+ }
}
$view->anonymousSites = $anonymousSites;