Bug 1834117: Property of non-object error

behatnotneeded

Change-Id: Iff8bb59f6b8a9dc370264bb303ba36ad9c3a457c
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/lib/view.php

@@ -5615,12 +5615,23 @@ class View {
                         else {
                             // Need to find the views to add it to
                             foreach ($viewdata as $k => $v) {
-                                if (!isset($v->id) || is_null($v->id)) {
-                                    continue;
+                                if (is_object($v)) {
+                                    if (!isset($v->id) || is_null($v->id)) {
+                                        continue;
+                                    }
+                                    $viewid = (isset($v->viewid) && !empty($v->viewid)) ? $v->viewid : $v->id;
+                                    if ($viewid == $tag->resourceid) {
+                                        $viewdata[$k]->tags[] = $tag->tag;
+                                    }
                                 }
-                                $viewid = (isset($v->viewid) && !empty($v->viewid)) ? $v->viewid : $v->id;
-                                if ($viewid == $tag->resourceid) {
-                                    $viewdata[$k]->tags[] = $tag->tag;
+                                else {
+                                    if (!isset($v['id'])) {
+                                        continue;
+                                    }
+                                    $viewid = (isset($v['viewid']) && !empty($v['viewid'])) ? $v['viewid'] : $v['id'];
+                                    if ($viewid == $tag->resourceid) {
+                                        $viewdata[$k]['tags'][] = $tag->tag;
+                                    }
                                 }
                             }
                         }