diff --git a/core/Access.php b/core/Access.php index 0205c408fdd0efce7de39cad280f01755d41c72a..6396aeb18b4a9aa699c565a5b423e905188b56f6 100644 --- a/core/Access.php +++ b/core/Access.php @@ -394,10 +394,7 @@ class Piwik_Access $idSites = $this->getSitesIdWithAtLeastViewAccess(); } - if(!is_array($idSites)) - { - $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); - } + $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); if(empty($idSites)) { throw new Piwik_Access_NoAccessException("The parameter 'idSite=' is missing from the request."); diff --git a/core/RankingQuery.php b/core/RankingQuery.php index 9003fb4061af0cc33e794e6e8fbb379049e60278..8de988b7df8e9fb191021334ddccde94f6c6f834 100644 --- a/core/RankingQuery.php +++ b/core/RankingQuery.php @@ -85,7 +85,7 @@ class Piwik_RankingQuery * The constructor. * Can be used as a shortcut for setLimit() */ - public function __construct($limit=false) + public function __construct($limit = false) { if ($limit !== false) { diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php index 58e0f435ebfc2ec6eb538ef4eb00afd4fbc86061..4475adbb76b115ed1b019754b38098b5f1491c4f 100644 --- a/core/Tracker/Visit.php +++ b/core/Tracker/Visit.php @@ -746,7 +746,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface $toRecord = Piwik_Common::getRequestVar($parameterForceRecord, false, 'int', $this->request); if(!$toRecord) { - printDebug($_SERVER['REQUEST_METHOD'].' parameter '.$parameterForceRecord.' not found in URL, request excluded'); + printDebug(@$_SERVER['REQUEST_METHOD'].' parameter '.$parameterForceRecord.' not found in URL, request excluded'); $excluded = true; printDebug("'$parameterForceRecord' parameter not found."); } diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 4cee07f05c09ab4e3a6a7b2e926838bf3e15a778..b6fe538573ac2bd72e71d4752c654d37ba14fa26 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -55,11 +55,8 @@ class Piwik_Goals_API { //TODO calls to this function could be cached as static // would help UI at least, since some UI requests would call this 2-3 times.. - if(!is_array($idSite)) - { - $idSite = Piwik_Site::getIdSitesFromIdSitesString($idSite); - } - if(empty($idSite)) + $idSite = Piwik_Site::getIdSitesFromIdSitesString($idSite); + if(empty($idSite)) { return array(); } diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index f75377e2b6200fd4ece9841ebdbbde771bc1e4a5..e880599974ed44fc206d32b276aadce29c6beebe 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -539,7 +539,7 @@ class Piwik_UsersManager_API $idSites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess(); } // in case the idSites is an integer we build an array - elseif(!is_array($idSites)) + else { $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); } diff --git a/tests/PHPUnit/FakeAccess.php b/tests/PHPUnit/FakeAccess.php index 069b41c697c73e1fba1db32accbf340bb8ce5153..a3942163efe9f18d106bf54b163968b90bac0534 100644 --- a/tests/PHPUnit/FakeAccess.php +++ b/tests/PHPUnit/FakeAccess.php @@ -62,10 +62,7 @@ class FakeAccess $websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId(); } - if(!is_array($idSites)) - { - $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); - } + $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); foreach($idSites as $idsite) { if(!in_array($idsite, $websitesAccess)) diff --git a/tests/core/Database.test.php b/tests/core/Database.test.php index 6b7bb677cbf1b2f6e9c4cafecb6b1c29a0b6901f..16d9ad234ae1cb85c568df45ff766796bf1bfec6 100644 --- a/tests/core/Database.test.php +++ b/tests/core/Database.test.php @@ -121,10 +121,7 @@ class FakeAccess $websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId(); } - if(!is_array($idSites)) - { - $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); - } + $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); foreach($idSites as $idsite) { if(!in_array($idsite, $websitesAccess))