1 files changed, 15 insertions, 12 deletions

diff --git a/plugins/Actions/Columns/EntryPageUrl.php b/plugins/Actions/Columns/EntryPageUrl.php
index 6b67b9a092..25750024da 100644
--- a/plugins/Actions/Columns/EntryPageUrl.php
+++ b/plugins/Actions/Columns/EntryPageUrl.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\Actions\Columns;
 
-use Piwik\Piwik;
-use Piwik\Plugins\Actions\Segment;
+use Piwik\Columns\Discriminator;
+use Piwik\Columns\Join\ActionNameJoin;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\Request;
@@ -19,13 +19,21 @@ class EntryPageUrl extends VisitDimension
 {
     protected $columnName = 'visit_entry_idaction_url';
     protected $columnType = 'INTEGER(11) UNSIGNED NULL  DEFAULT NULL';
+    protected $segmentName = 'entryPageUrl';
+    protected $nameSingular = 'Actions_ColumnEntryPageURL';
+    protected $namePlural = 'Actions_ColumnEntryPageURLs';
+    protected $category = 'General_Actions';
+    protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment';
+    protected $type = self::TYPE_URL;
 
-    protected function configureSegments()
+    public function getDbColumnJoin()
     {
-        $segment = new Segment();
-        $segment->setSegment('entryPageUrl');
-        $segment->setName('Actions_ColumnEntryPageURL');
-        $this->addSegment($segment);
+        return new ActionNameJoin();
+    }
+
+    public function getDbDiscriminator()
+    {
+        return new Discriminator('log_action', 'type', Action::TYPE_PAGE_URL);
     }
 
     /**
@@ -69,9 +77,4 @@ class EntryPageUrl extends VisitDimension
         return false;
     }
 
-    public function getName()
-    {
-        return Piwik::translate('Actions_ColumnEntryPageURL');
-    }
-
 }