bugfix for aggregated activity enrichment

tbarbugli · tbarbugli · commit d929fc9ac292 · 2015-02-20T10:55:23.000-05:00
diff --git a/src/GetStream/StreamLaravel/Enrich.php b/src/GetStream/StreamLaravel/Enrich.php
@@ -104,7 +104,7 @@ public function enrichActivities($activities)
     public function enrichAggregatedActivities($aggregatedActivities)
     {
         foreach ($aggregatedActivities as $i => $aggregated) {
-            $aggregated['activities'] = $this->wrapActivities($aggregated['activities']);
+            $aggregatedActivities[$i]['activities'] = $this->wrapActivities($aggregated['activities']);
         }
 
         if (count($aggregatedActivities) === 0) {
diff --git a/src/views/render_activity.blade.php b/src/views/render_activity.blade.php
@@ -1,4 +1,4 @@
-@if ($activity->enriched())
+@if (is_array($activity) || $activity->enriched())
     @if (isset($prefix))
         @if (array_key_exists('activities', $activity))
             @include("aggregated_activity.{$prefix}_{$activity['verb']}", array('activity'=>$activity))

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function enrichActivities($activities)`
`104`	`104`	`public function enrichAggregatedActivities($aggregatedActivities)`
`105`	`105`	`{`
`106`	`106`	`foreach ($aggregatedActivities as $i => $aggregated) {`
`107`		`- $aggregated['activities'] = $this->wrapActivities($aggregated['activities']);`
	`107`	`+ $aggregatedActivities[$i]['activities'] = $this->wrapActivities($aggregated['activities']);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`if (count($aggregatedActivities) === 0) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@if ($activity->enriched())`
	`1`	`+@if (is_array($activity) \|\| $activity->enriched())`
`2`	`2`	`@if (isset($prefix))`
`3`	`3`	`@if (array_key_exists('activities', $activity))`
`4`	`4`	`@include("aggregated_activity.{$prefix}_{$activity['verb']}", array('activity'=>$activity))`