fix backward compatibility for Referrer.addSearchEngineUrls event

1 files changed, 21 insertions, 1 deletions

diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php
index 41542e1548..14009a9029 100644
--- a/plugins/Referrers/SearchEngine.php
+++ b/plugins/Referrers/SearchEngine.php
@@ -49,7 +49,7 @@ class SearchEngine extends Singleton
 
     private function loadDefinitions()
     {
-        if ($this->definitionList === null) {
+        if (empty($this->definitionList)) {
             // Read first from the auto-updated list in database
             $list = Option::get(self::OPTION_STORAGE_NAME);
 
@@ -65,10 +65,30 @@ class SearchEngine extends Singleton
 
         Piwik::postEvent('Referrer.addSearchEngineUrls', array(&$this->definitionList));
 
+        $this->convertLegacyDefinitions();
+
         return $this->definitionList;
     }
 
     /**
+     * @deprecated remove in 3.0
+     */
+    protected function convertLegacyDefinitions()
+    {
+        foreach ($this->definitionList as $url => $definition) {
+            if (!array_key_exists('name', $definition) && isset($definition[0]) && isset($definition[1])) {
+                $this->definitionList[$url] = array(
+                    'name' => $definition[0],
+                    'params' => $definition[1],
+                    'backlink' => @$definition[2],
+                    'charsets' => @$definition[3]
+                );
+            }
+        }
+
+    }
+
+    /**
      * Parses the given YML string and caches the resulting definitions
      *
      * @param string $yml