Merge branch 'release/3.0.9' into v3

* release/3.0.9:
  added 3.0.9 change info
  v 3.0.9 checks for missinig "meta" obj Instagram feed

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.0.9 - 2018-04-04
+### Fixed
+- Instagram feed has been missinig "meta" object for some users. This update is fixed to check for the presence of "meta". If missing it will attempt to serve stale cache if available. 
+
 ## 3.0.8 - 2018-03-15
 ### Fixed
 - License text fix.

composer.json

@@ -2,7 +2,7 @@
     "name": "jmx2/pic-puller",
     "description": "Integrate Instagram into Craft CMS.",
     "type": "craft-plugin",
-    "version": "3.0.8",
+    "version": "3.0.9",
     "keywords": [
         "craft",
         "cms",

src/PicPuller.php

@@ -64,6 +64,9 @@ class PicPuller extends Plugin
      */
     public static $plugin;
 
+    // The actual version number is iin the composer.json file
+    // This is only the schema version. A change in scheme versioni
+    // trigger a database change.
     public $schemaVersion = '3.0.5';
     public $hasCpSettings = true;
     public $hasCpSection = true;

src/services/Feed.php

@@ -407,7 +407,14 @@ private function _fetch_data ($url , $use_stale_cache)
 
     private function _validate_data ($data , $url , $use_stale_cache)
     {
-        $meta = $data['meta'];
+        if ( array_key_exists('meta', $data) ){
+            $meta = $data['meta'];
+        } else {
+            // Sometimes the Instagram returns a malformed JSON object
+            // without the expected meta object
+            $meta['code'] = false;
+        }
+
         // meta > code equal to 200 means we have a successful request returned
         if ($meta['code'] == 200) {
             // There is an outlying chance that IG says 200, but the data array is empty.