Changeset 1925664

Timestamp:

08/16/2018 09:00:13 AM (8 years ago)

Author:

phuisman

Message:

Better checks

Location:

flickr-field-for-advanced-custom-fields/trunk

Files:

• acf-flickr-v4.php (modified) (2 diffs)
• acf-flickr-v5.php (modified) (2 diffs)

flickr-field-for-advanced-custom-fields/trunk/acf-flickr-v4.php

@@ -449 +449 @@
                     <tbody>
                         <?php
-                        if (!empty($flickr_data)) {
+                        if (!empty($flickr_data) && isset($flickr_data->photosets->photoset)) {
                             foreach($flickr_data->photosets->photoset as $key => $flickr) {
                                 ?>
@@ -499 +499 @@
                             if (is_array($items)) {
                                 foreach ($items as $k => $item) {
-                                    if (is_object($item)) {
+                                    if(!is_string($item)) {
                                         $item = get_object_vars($item);
                                         if(is_array($item) && in_array($photo['id'], $item)) {

flickr-field-for-advanced-custom-fields/trunk/acf-flickr-v5.php

@@ -325 +325 @@
                     <tbody>
                         <?php
-                        if (!empty($flickr_data)) {
+                        if (!empty($flickr_data) && isset($flickr_data->photosets->photoset)) {
                             foreach($flickr_data->photosets->photoset as $key => $flickr) {
                                 ?>
@@ -374 +374 @@
                             if (is_array($items)) {
                                 foreach ($items as $k => $item) {
-                                    $item = get_object_vars($item);
-                                    if(is_array($item) && in_array($photo['id'], $item)) {
-                                        $active = ' active-row';
+                                    if(!is_string($item)) {
+                                        $item = get_object_vars($item);
+                                        if(is_array($item) && in_array($photo['id'], $item)) {
+                                            $active = ' active-row';
+                                        }
                                     }
                                 }