Assume hidden keywords to be available by default (#16747)

* Assume hidden keywords to be available by default

* adds a simple system test

2 files changed, 21 insertions, 1 deletions

diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php
index ee8c26a45e..f77bd2ab8f 100644
--- a/plugins/Referrers/SearchEngine.php
+++ b/plugins/Referrers/SearchEngine.php
@@ -205,7 +205,9 @@ class SearchEngine extends Singleton
 
         $searchEngineName = $definitions['name'];
         $variableNames    = $definitions['params'];
-        $keywordsHiddenFor = !empty($definitions['hiddenkeyword']) ? $definitions['hiddenkeyword'] : array();
+        $keywordsHiddenFor = !empty($definitions['hiddenkeyword']) ? $definitions['hiddenkeyword'] : array(
+            '/^$/', '/'
+        );
 
         $key = null;
         if ($searchEngineName === 'Google Images') {
diff --git a/plugins/Referrers/tests/System/ApiTest.php b/plugins/Referrers/tests/System/ApiTest.php
index 03ff7d533b..6dad34603c 100644
--- a/plugins/Referrers/tests/System/ApiTest.php
+++ b/plugins/Referrers/tests/System/ApiTest.php
@@ -276,6 +276,24 @@ class ApiTest extends SystemTestCase
         $this->assertEquals(2, $visits->getFirstRow()->getColumn('nb_visits'));
     }
 
+    public function test_searchEngineWithHiddenKeywordIsTrackedCorrectly()
+    {
+        $dateTime = '2015-01-09';
+        $idSite = self::$fixture->idSite;
+
+        $t = Fixture::getTracker($idSite, $dateTime . ' 00:01:02', $defaultInit = true);
+
+        $t->setUrlReferrer('https://www.looksmart.com/');
+        $t->setUrl('http://piwik.net/page1');
+        $t->doTrackPageView('Page 1');
+
+        /** @var DataTable $visits */
+        $visits = Request::processRequest('Referrers.getSearchEngines', array('idSite' => 1, 'period' => 'day', 'date' => $dateTime));
+
+        $this->assertEquals('Looksmart', $visits->getFirstRow()->getColumn('label'));
+        $this->assertEquals(1, $visits->getFirstRow()->getColumn('nb_visits'));
+    }
+
     public static function getOutputPrefix()
     {
         return '';