refs #4633 we should convert a segment value to a segment filter before queued...

refs #4633 we should convert a segment value to a segment filter before queued filters are applied which allows us to use the prependSegment filter in combination with AddSegmentValue

core/API/DataTablePostProcessor.php

@@ -95,17 +95,16 @@ class DataTablePostProcessor
         // we automatically safe decode all datatable labels (against xss)
         $dataTable->queueFilter('SafeDecodeLabel');
 
+        $dataTable = $this->convertSegmentValueToSegment($dataTable);
         $dataTable = $this->applyQueuedFilters($dataTable);
         $dataTable = $this->applyRequestedColumnDeletion($dataTable);
         $dataTable = $this->applyLabelFilter($dataTable);
-
         $dataTable = $this->applyMetricsFormatting($dataTable);
-        $dataTable = $this->convertSegmentValueToSegment($dataTable);
 
         return $dataTable;
     }
 
-    public function convertSegmentValueToSegment(DataTableInterface $dataTable)
+    private function convertSegmentValueToSegment(DataTableInterface $dataTable)
     {
         $dataTable->filter('AddSegmentBySegmentValue', array($this->report));
         $dataTable->filter('ColumnCallbackDeleteMetadata', array('segmentValue'));

plugins/Referrers/API.php

@@ -140,13 +140,8 @@ class API extends \Piwik\Plugin\API
     public function getKeywords($idSite, $period, $date, $segment = false, $expanded = false)
     {
         $dataTable = $this->getDataTable(Archiver::KEYWORDS_RECORD_NAME, $idSite, $period, $date, $segment, $expanded);
-        $dataTable->filter('AddSegmentValue', array(function ($label) {
-            if ($label === false) {
-                return false;
-            }
-
-            return $label . ';referrerType==search';
-        }));
+        $dataTable->filter('AddSegmentValue');
+        $dataTable->queueFilter('PrependSegment', array('referrerType==search;'));
 
         $dataTable = $this->handleKeywordNotDefined($dataTable);
         return $dataTable;