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:
authormatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-07-29 15:18:25 +0400
committermatt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2010-07-29 15:18:25 +0400
commit83243402beebf18d33fafce71c00d100eefe0894 (patch)
treec0f151ed01f79739d5d2047d9a86232f93f14fd2 /core
parent5c8954b87bdfc789f1de6ec5935b8860d0f04ce7 (diff)
Fixes #1526
removing feature to disable website selector, as website selector now works in all cases
Diffstat (limited to 'core')
-rw-r--r--core/View.php11
1 files changed, 3 insertions, 8 deletions
diff --git a/core/View.php b/core/View.php
index abe118c952..6bb5e6550b 100644
--- a/core/View.php
+++ b/core/View.php
@@ -117,14 +117,9 @@ class Piwik_View implements Piwik_iView
$this->currentPluginName = Piwik::getCurrentPlugin()->getClassName();
$this->userLogin = Piwik::getCurrentUserLogin();
- $showWebsiteSelectorInUserInterface = Zend_Registry::get('config')->General->show_website_selector_in_user_interface;
- if($showWebsiteSelectorInUserInterface)
- {
- $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAtLeastViewAccess(Zend_Registry::get('config')->General->site_selector_max_sites);
- usort($sites, create_function('$site1, $site2', 'return strcasecmp($site1["name"], $site2["name"]);'));
- $this->sites = $sites;
- }
- $this->showWebsiteSelectorInUserInterface = $showWebsiteSelectorInUserInterface;
+ $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAtLeastViewAccess(Zend_Registry::get('config')->General->site_selector_max_sites);
+ usort($sites, create_function('$site1, $site2', 'return strcasecmp($site1["name"], $site2["name"]);'));
+ $this->sites = $sites;
$this->url = Piwik_Url::getCurrentUrl();
$this->token_auth = Piwik::getCurrentUserTokenAuth();
$this->userHasSomeAdminAccess = Piwik::isUserHasSomeAdminAccess();