Merge branch 'hotfix/empty-taxonimies'

factor1 · Oct 9, 2017 · 759607c · 759607c
2 parents a0e8f4a + ac6149c
commit 759607c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/better-wp-endpoints.php b/better-wp-endpoints.php
@@ -3,7 +3,7 @@
 Plugin Name:  Better WordPress Endpoints
 Plugin URI:   https://github.com/factor1/better-wp-endpoints/
 Description:  Serves up slimmer WordPress Rest API endpoints, with some great enhancements.
-Version:      0.1.5
+Version:      0.1.6
 Author:       Eric Stout, Factor1 Studios
 Author URI:   https://factor1studios.com/
 License:      GPL3

diff --git a/includes/get_post_by_id.php b/includes/get_post_by_id.php
@@ -43,9 +43,11 @@ function get_post_by_id( $data ) {
       $bwe_categories = [];
       $bwe_category_ids = [];
 
-      foreach ($categories as $key => $category) {
-        array_push($bwe_category_ids, $category->term_id);
-        array_push($bwe_categories, $category->cat_name);
+      if( !empty($categories) ){
+        foreach ($categories as $key => $category) {
+          array_push($bwe_category_ids, $category->term_id);
+          array_push($bwe_categories, $category->cat_name);
+        }
       }
 
       $bwe_post->category_ids = $bwe_category_ids;
@@ -61,9 +63,11 @@ function get_post_by_id( $data ) {
       $bwe_tags = [];
       $bwe_tag_ids = [];
 
-      foreach ($tags as $key => $tag) {
-        array_push($bwe_tag_ids, $tag->term_id);
-        array_push($bwe_tags, $tag->name);
+      if( !empty($tags) ){
+        foreach ($tags as $key => $tag) {
+          array_push($bwe_tag_ids, $tag->term_id);
+          array_push($bwe_tags, $tag->name);
+        }
       }
 
       $bwe_post->tag_ids = $bwe_tag_ids;

diff --git a/includes/get_posts.php b/includes/get_posts.php
@@ -64,9 +64,11 @@ function bwe_get_posts( WP_REST_Request $request ) {
       $bwe_categories = [];
       $bwe_category_ids = [];
 
-      foreach ($categories as $key => $category) {
-        array_push($bwe_category_ids, $category->term_id);
-        array_push($bwe_categories, $category->cat_name);
+      if( !empty($categories) ){
+        foreach ($categories as $key => $category) {
+          array_push($bwe_category_ids, $category->term_id);
+          array_push($bwe_categories, $category->cat_name);
+        }
       }
 
       $bwe_post->category_ids = $bwe_category_ids;
@@ -82,11 +84,14 @@ function bwe_get_posts( WP_REST_Request $request ) {
       $bwe_tags = [];
       $bwe_tag_ids = [];
 
-      foreach ($tags as $key => $tag) {
-        array_push($bwe_tag_ids, $tag->term_id);
-        array_push($bwe_tags, $tag->name);
+      if( !empty($tags) ){
+        foreach ($tags as $key => $tag) {
+          array_push($bwe_tag_ids, $tag->term_id);
+          array_push($bwe_tags, $tag->name);
+        }
       }
 
+
       $bwe_post->tag_ids = $bwe_tag_ids;
       $bwe_post->tag_names = $bwe_tags;
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "better-wp-endpoints",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Serves up slimmer WordPress Rest API endpoints.",
   "main": "index.js",
   "scripts": {