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:
authormattab <matthieu.aubry@gmail.com>2013-09-14 06:37:21 +0400
committermattab <matthieu.aubry@gmail.com>2013-09-14 06:37:21 +0400
commit8d11a25fa7f41212584a58998c59884a4b9836d4 (patch)
tree39d6e3892346288619987f32a562f7e102c6f34c /plugins/SitesManager
parent4e910af4d770e19bcc7f953840662ee8a4c08b20 (diff)
Moving PHP/server settings getter/setter to SettingsServer class
Diffstat (limited to 'plugins/SitesManager')
-rw-r--r--plugins/SitesManager/API.php13
-rw-r--r--plugins/SitesManager/Controller.php12
2 files changed, 13 insertions, 12 deletions
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 5904097dd6..2dcc54efed 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -11,16 +11,17 @@
namespace Piwik\Plugins\SitesManager;
use Exception;
-use Piwik\Piwik;
-use Piwik\Common;
use Piwik\Access;
+use Piwik\Common;
use Piwik\Date;
-use Piwik\IP;
use Piwik\Db;
+use Piwik\IP;
+use Piwik\Piwik;
+use Piwik\SettingsServer;
+use Piwik\Site;
+use Piwik\TaskScheduler;
use Piwik\Tracker\Cache;
use Piwik\Url;
-use Piwik\TaskScheduler;
-use Piwik\Site;
/**
* The SitesManager API gives you full control on Websites in Piwik (create, update and delete), and many methods to retrieve websites based on various attributes.
@@ -1101,7 +1102,7 @@ class API
*/
public function getTimezonesList()
{
- if (!Piwik::isTimezoneSupportEnabled()) {
+ if (!SettingsServer::isTimezoneSupportEnabled()) {
return array('UTC' => $this->getTimezonesListUTCOffsets());
}
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 7a03152256..5629e009e9 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -12,15 +12,15 @@ namespace Piwik\Plugins\SitesManager;
use Exception;
use Piwik\API\ResponseBuilder;
-use Piwik\DataTable\Renderer\Json;
-use Piwik\Piwik;
use Piwik\Common;
+use Piwik\DataTable\Renderer\Json;
use Piwik\Date;
use Piwik\IP;
-use Piwik\Plugins\SitesManager\API;
-use Piwik\View;
-use Piwik\Url;
+use Piwik\Piwik;
+use Piwik\SettingsServer;
use Piwik\Site;
+use Piwik\Url;
+use Piwik\View;
/**
*
@@ -54,7 +54,7 @@ class Controller extends \Piwik\Controller\Admin
$view->adminSitesCount = count($sites);
$timezones = API::getInstance()->getTimezonesList();
- $view->timezoneSupported = Piwik::isTimezoneSupportEnabled();
+ $view->timezoneSupported = SettingsServer::isTimezoneSupportEnabled();
$view->timezones = Common::json_encode($timezones);
$view->defaultTimezone = API::getInstance()->getDefaultTimezone();