diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-02-11 07:05:51 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-02-11 07:05:51 +0400 |
| commit | d1684719f1d494e9b1a2d686b5da0e4164f11340 (patch) | |
| tree | 4507d423f13d2894e126ec285f5787f0fc4fd568 /core/Segment.php | |
| parent | 5a74d8d7fb1b7e2014cb73d746d970e4627c0f60 (diff) | |
Fixes #4001 Deprecate force_ssl_login setting as it's too hard to properly enforce
Diffstat (limited to 'core/Segment.php')
| -rw-r--r-- | core/Segment.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/Segment.php b/core/Segment.php index ef0b72f9b6..906a3c139f 100644 --- a/core/Segment.php +++ b/core/Segment.php @@ -316,8 +316,6 @@ class Segment // first table $sql .= $tableSql; } else { - $join = ""; - if ($actionsAvailable && $table == "log_conversion") { // have actions, need conversions => join on idlink_va $join = "log_conversion.idlink_va = log_link_visit_action.idlink_va " @@ -349,7 +347,7 @@ class Segment } elseif ($conversionItemAvailable && $table === 'log_link_visit_action') { $join = "log_conversion_item.idvisit = log_link_visit_action.idvisit"; } else { - throw new Exception("Table '$table', can't be joined for segmentation"); + throw new Exception("Table '$table' can't be joined for segmentation"); } // the join sql the default way |