Merge pull request pyrocms#1758 from RyanThompson/patch-4

Have to use $stream_fields here.
tantignac · Sep 17, 2012 · 085145d · 085145d
2 parents b2c9858 + 186af9e
commit 085145d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/cms/modules/streams_core/models/row_m.php b/system/cms/modules/streams_core/models/row_m.php
@@ -899,12 +899,12 @@ public function format_row($row, $stream_fields, $stream, $return_object = true,
 				if ($return_object)
 				{
 					$row->$row_slug = $this->format_column($row_slug,
-						$row->$row_slug, $row->id, $this->all_fields[$row_slug]['field_type'], $this->all_fields[$row_slug]['field_data'], $stream, $plugin_call);
+						$row->$row_slug, $row->id, $stream_fields->$row_slug->field_type, $stream_fields->$row_slug->field_data, $stream, $plugin_call);
 				}
 				else
 				{
 					$row[$row_slug] = $this->format_column($row_slug,
-						$row[$row_slug], $row['id'], $this->all_fields[$row_slug]['field_type'], $this->all_fields[$row_slug]['field_data'], $stream, $plugin_call);
+						$row[$row_slug], $row['id'], $stream_fields->$row_slug->field_type, $stream_fields->$row_slug->field_data, $stream, $plugin_call);
 				}
 			}
 		}