diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-10-20 14:02:16 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-10-20 14:02:16 +0400 |
commit | 15a4fc8bacc4d7091e2a3f23c036ce1bcba89116 (patch) | |
tree | 262309f11f5b5d864ae218a584a2076991170282 | |
parent | 099eda0d9428c9cbf4d825cd1928179f5b740cf1 (diff) |
Minor refs #472
-rw-r--r-- | core/Tracker/Action.php | 2 | ||||
-rw-r--r-- | core/Tracker/ActionSiteSearch.php | 2 | ||||
-rw-r--r-- | core/Tracker/PageUrl.php | 2 | ||||
-rw-r--r-- | core/Tracker/TableActionIds.php | 3 | ||||
-rw-r--r-- | piwik.php | 5 |
5 files changed, 11 insertions, 3 deletions
diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index bcd540bca0..d875ced45f 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -307,7 +307,7 @@ class Action implements ActionInterface protected function getUrlAndType() { $url = $this->getActionUrl(); - if (!is_null($url)) { + if (!empty($url)) { // normalize urls by stripping protocol and www $url = PageUrl::normalizeUrl($url); return array($url['url'], Tracker\Action::TYPE_PAGE_URL, $url['prefixId']); diff --git a/core/Tracker/ActionSiteSearch.php b/core/Tracker/ActionSiteSearch.php index 210d848386..ee380be979 100644 --- a/core/Tracker/ActionSiteSearch.php +++ b/core/Tracker/ActionSiteSearch.php @@ -54,6 +54,8 @@ class ActionSiteSearch extends Action } $this->setActionName($actionName); $this->setActionUrl($url); + + return true; } // FIXMEA replace by getNameAndType diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php index 46fc0685de..dc3073b3af 100644 --- a/core/Tracker/PageUrl.php +++ b/core/Tracker/PageUrl.php @@ -321,7 +321,7 @@ class PageUrl if (!UrlHelper::isLookLikeUrl($url)) { Common::printDebug("WARNING: URL looks invalid and is discarded"); - $url = ''; + $url = false; return $url; } return $url; diff --git a/core/Tracker/TableActionIds.php b/core/Tracker/TableActionIds.php index 6fd46343fe..ab64fa34fd 100644 --- a/core/Tracker/TableActionIds.php +++ b/core/Tracker/TableActionIds.php @@ -95,7 +95,8 @@ class TableActionIds $actionId = Tracker::getDatabase()->lastInsertId(); Common::printDebug("Recorded a new action (" . Action::getTypeAsString($type) . ") in the lookup table: " . $name . " (idaction = " . $actionId . ")"); - $actionNamesAndTypes[$actionToInsert][] = $actionId; + $keyIdAction = 3; + $actionNamesAndTypes[$actionToInsert][$keyIdAction] = $actionId; } return $actionNamesAndTypes; } @@ -55,7 +55,12 @@ require_once PIWIK_INCLUDE_PATH . '/core/Tracker/IgnoreCookie.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitInterface.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Visit.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/GoalManager.php'; +require_once PIWIK_INCLUDE_PATH . '/core/Tracker/PageUrl.php'; +require_once PIWIK_INCLUDE_PATH . '/core/Tracker/TableActionIds.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Action.php'; +require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionClickUrl.php'; +require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionPageview.php'; +require_once PIWIK_INCLUDE_PATH . '/core/Tracker/ActionSiteSearch.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Request.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/Referrer.php'; require_once PIWIK_INCLUDE_PATH . '/core/Tracker/VisitExcluded.php'; |