Merge branch '2.x-dev' into 3.0-m09

2 files changed, 26 insertions, 2 deletions

diff --git a/plugins/Actions/Columns/EntryPageUrl.php b/plugins/Actions/Columns/EntryPageUrl.php
index 7f3ef19ad1..6b67b9a092 100644
--- a/plugins/Actions/Columns/EntryPageUrl.php
+++ b/plugins/Actions/Columns/EntryPageUrl.php
@@ -18,7 +18,7 @@ use Piwik\Tracker\Visitor;
 class EntryPageUrl extends VisitDimension
 {
     protected $columnName = 'visit_entry_idaction_url';
-    protected $columnType = 'INTEGER(10) UNSIGNED NULL';
+    protected $columnType = 'INTEGER(11) UNSIGNED NULL  DEFAULT NULL';
 
     protected function configureSegments()
     {
@@ -42,9 +42,33 @@ class EntryPageUrl extends VisitDimension
             $idActionUrl = $action->getIdActionUrlForEntryAndExitIds();
         }
 
+        if($idActionUrl === false) {
+            return false;
+        }
+
         return (int) $idActionUrl;
     }
 
+    /*
+     * @param Request $request
+     * @param Visitor $visitor
+     * @param Action|null $action
+     * @return mixed
+     */
+    public function onExistingVisit(Request $request, Visitor $visitor, $action)
+    {
+        $idAction = $visitor->getVisitorColumn('visit_entry_idaction_url');
+
+        if (is_null($idAction) && !empty($action)) {
+            $idAction = $action->getIdActionUrlForEntryAndExitIds();
+            if (!empty($idAction)) {
+                return $idAction;
+            }
+        }
+
+        return false;
+    }
+
     public function getName()
     {
         return Piwik::translate('Actions_ColumnEntryPageURL');
diff --git a/plugins/Actions/Columns/IdPageview.php b/plugins/Actions/Columns/IdPageview.php
index 0fed0cf397..c1d5352153 100644
--- a/plugins/Actions/Columns/IdPageview.php
+++ b/plugins/Actions/Columns/IdPageview.php
@@ -29,7 +29,7 @@ class IdPageview extends ActionDimension
      */
     public function onNewAction(Request $request, Visitor $visitor, Action $action)
     {
-        return $request->getParam('pv_id');
+        return substr($request->getParam('pv_id'), 0, 6);
     }
 
     public function getName()