Permalink
Browse files

Fixes #1526

removing feature to disable website selector, as website selector now works in all cases
  • Loading branch information...
1 parent 5c8954b commit 83243402beebf18d33fafce71c00d100eefe0894 matt committed Jul 29, 2010
Showing with 4 additions and 14 deletions.
  1. +0 −5 config/global.ini.php
  2. +3 −8 core/View.php
  3. +1 −1 plugins/CoreHome/templates/top_bar.tpl
View
@@ -88,11 +88,6 @@
; default number of rows returned in API responses
API_datatable_default_limit = 50
-; if set to 1, the website selector will be displayed in the Piwik UI
-; if your Piwik installation has thousands of websites, you may disable the website selector
-; as it slows down the loading of the Piwik UI by setting this value to 0
-show_website_selector_in_user_interface = 1
-
; This setting is overriden in the UI, under "User Settings".
; The date and period loaded by Piwik uses the defaults below. Possible values: yesterday, today.
default_day = yesterday
View
@@ -117,14 +117,9 @@ public function render()
$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();
@@ -23,4 +23,4 @@
</div>
-{if $showSitesSelection && $showWebsiteSelectorInUserInterface}{include file=CoreHome/templates/sites_selection.tpl}{/if}
+{if $showSitesSelection}{include file=CoreHome/templates/sites_selection.tpl}{/if}

0 comments on commit 8324340

Please sign in to comment.