diff options
| author | benakamoorthi <benaka.moorthi@gmail.com> | 2012-09-13 06:22:04 +0400 |
|---|---|---|
| committer | benakamoorthi <benaka.moorthi@gmail.com> | 2012-09-13 06:22:04 +0400 |
| commit | db1991fdd02f225b13cd725d7b8a20b2b1e2b32f (patch) | |
| tree | 8399643b885e18fba8c819a462382434bf1b5b67 /core/Segment.php | |
| parent | d09ab34dff6ba04afed225d17c431489c4097827 (diff) | |
Refs #3330, #766, #3227 use RankingQuery and truncate tables as they are created in Actions plugin. Also modified phpunit integration testing mechanism so all API calls are tested and outputted before a test case throws.
git-svn-id: http://dev.piwik.org/svn/trunk@6980 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Segment.php')
| -rw-r--r-- | core/Segment.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/Segment.php b/core/Segment.php index 5b5c2d40ee..6824206fed 100644 --- a/core/Segment.php +++ b/core/Segment.php @@ -398,7 +398,7 @@ class Piwik_Segment */ private function buildWrappedSelectQuery($select, $from, $where, $orderBy, $groupBy) { - preg_match_all("/(log_visit|log_conversion).[a-z0-9_\*]+/", $select, $matches); + preg_match_all("/(log_visit|log_conversion|log_action).[a-z0-9_\*]+/", $select, $matches); $neededFields = array_unique($matches[0]); if (count($neededFields) == 0) @@ -407,9 +407,9 @@ class Piwik_Segment ."Please use a table prefix."); } - $select = preg_replace('/(log_visit|log_conversion)\./', 'log_inner.', $select); - $orderBy = preg_replace('/(log_visit|log_conversion)\./', 'log_inner.', $orderBy); - $groupBy = preg_replace('/(log_visit|log_conversion)\./', 'log_inner.', $groupBy); + $select = preg_replace('/(log_visit|log_conversion|log_action)\./', 'log_inner.', $select); + $orderBy = preg_replace('/(log_visit|log_conversion|log_action)\./', 'log_inner.', $orderBy); + $groupBy = preg_replace('/(log_visit|log_conversion|log_action)\./', 'log_inner.', $groupBy); $from = "( SELECT @@ -426,4 +426,4 @@ class Piwik_Segment return $this->buildSelectQuery($select, $from, $where, $orderBy, $groupBy); } -}
\ No newline at end of file +} |