Fix bug in SegmentEditor plugin, make sure getKnownSegmentsToArchiveA…

…llSites adds segment definitions to output segment array and not whole stored segment data.
matomo-org · Jun 11, 2013 · c5de357 · c5de357
1 parent 7005ef7
commit c5de357
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/Piwik.php b/core/Piwik.php
@@ -1539,10 +1539,11 @@ static public function getKnownSegmentsToArchive()
 
         if (is_null($cachedResult)) {
             $segments = Piwik_Config::getInstance()->Segments;
-            $cachedResult = isset($segments['Segments']) ? $segments['Segments'] : '';
+            $cachedResult = isset($segments['Segments']) ? $segments['Segments'] : array();
 
             Piwik_PostEvent('Piwik.getKnownSegmentsToArchiveAllSites', $cachedResult);
-
+
+            $cachedResult = array_unique($cachedResult);
         }
 
         return $cachedResult;

diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
@@ -45,9 +45,11 @@ function getSegmentEditorHtml($notification)
     public function getKnownSegmentsToArchiveAllSites($notification)
     {
         $segments =& $notification->getNotificationObject();
-        $segmentToAutoArchive = Piwik_SegmentEditor_API::getInstance()->getAll($idSite = false, $returnAutoArchived = true);
-        if (!empty($segmentToAutoArchive)) {
-            $segments = array_merge($segments, $segmentToAutoArchive);
+        $segmentsToAutoArchive = Piwik_SegmentEditor_API::getInstance()->getAll(
+            $idSite = false, $returnAutoArchived = true);
+
+        foreach ($segmentsToAutoArchive as $segment) {
+            $segments[] = $segment['definition'];
         }
     }