Skip to content
Extraits de code Groupes Projets
Valider 2bdfceca rédigé par mattpiwik's avatar mattpiwik
Parcourir les fichiers

Follow up of previous api change + cleanup NOTICEs in tests

git-svn-id: http://dev.piwik.org/svn/trunk@6974 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent 738bb4b8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -394,10 +394,7 @@ class Piwik_Access ...@@ -394,10 +394,7 @@ class Piwik_Access
$idSites = $this->getSitesIdWithAtLeastViewAccess(); $idSites = $this->getSitesIdWithAtLeastViewAccess();
} }
if(!is_array($idSites)) $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
{
$idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
}
if(empty($idSites)) if(empty($idSites))
{ {
throw new Piwik_Access_NoAccessException("The parameter 'idSite=' is missing from the request."); throw new Piwik_Access_NoAccessException("The parameter 'idSite=' is missing from the request.");
......
...@@ -85,7 +85,7 @@ class Piwik_RankingQuery ...@@ -85,7 +85,7 @@ class Piwik_RankingQuery
* The constructor. * The constructor.
* Can be used as a shortcut for setLimit() * Can be used as a shortcut for setLimit()
*/ */
public function __construct($limit=false) public function __construct($limit = false)
{ {
if ($limit !== false) if ($limit !== false)
{ {
......
...@@ -746,7 +746,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface ...@@ -746,7 +746,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
$toRecord = Piwik_Common::getRequestVar($parameterForceRecord, false, 'int', $this->request); $toRecord = Piwik_Common::getRequestVar($parameterForceRecord, false, 'int', $this->request);
if(!$toRecord) 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; $excluded = true;
printDebug("'$parameterForceRecord' parameter not found."); printDebug("'$parameterForceRecord' parameter not found.");
} }
......
...@@ -55,11 +55,8 @@ class Piwik_Goals_API ...@@ -55,11 +55,8 @@ class Piwik_Goals_API
{ {
//TODO calls to this function could be cached as static //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.. // 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(); return array();
} }
......
...@@ -539,7 +539,7 @@ class Piwik_UsersManager_API ...@@ -539,7 +539,7 @@ class Piwik_UsersManager_API
$idSites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess(); $idSites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess();
} }
// in case the idSites is an integer we build an array // in case the idSites is an integer we build an array
elseif(!is_array($idSites)) else
{ {
$idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites); $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
} }
......
...@@ -62,10 +62,7 @@ class FakeAccess ...@@ -62,10 +62,7 @@ class FakeAccess
$websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId(); $websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId();
} }
if(!is_array($idSites)) $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
{
$idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
}
foreach($idSites as $idsite) foreach($idSites as $idsite)
{ {
if(!in_array($idsite, $websitesAccess)) if(!in_array($idsite, $websitesAccess))
......
...@@ -121,10 +121,7 @@ class FakeAccess ...@@ -121,10 +121,7 @@ class FakeAccess
$websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId(); $websitesAccess=Piwik_SitesManager_API::getInstance()->getAllSitesId();
} }
if(!is_array($idSites)) $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
{
$idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
}
foreach($idSites as $idsite) foreach($idSites as $idsite)
{ {
if(!in_array($idsite, $websitesAccess)) if(!in_array($idsite, $websitesAccess))
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter