Changeset 1519308

Timestamp:

10/21/2016 02:40:50 PM (9 years ago)

Author:

nvaughan84

Message:

fixed bugs with shipping and variants

Location:

merchant-xml-feed-generator/trunk

Files:

• gmpf-generator.php (modified) (1 diff)
• gmpf-shipping.php (modified) (1 diff)
• gmpf.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

merchant-xml-feed-generator/trunk/gmpf-generator.php

@@ -190 +190 @@
         $variants = unserialize($variants);
 
-        if(in_array($product_id, $variants))
+        if($variants && in_array($product_id, $variants))
         {
             return true;

merchant-xml-feed-generator/trunk/gmpf-shipping.php

@@ -69 +69 @@
                 $countries = $settings['countries'];
 
-                foreach($countries as $country)
-                {
-                    $selected = ($country == $ship_to) ? 'selected' : '';
-                    $shipping_country .= '<option '.$selected.' value="'.$country.'">'.$country.'</option>';
-                }
+                if($countries):
+                    foreach($countries as $country)
+                    {
+                        $selected = ($country == $ship_to) ? 'selected' : '';
+                        $shipping_country .= '<option '.$selected.' value="'.$country.'">'.$country.'</option>';
+                    }
+                endif;
 
             $shipping_country .= '</select>';

merchant-xml-feed-generator/trunk/gmpf.php

@@ -4 +4 @@
 Plugin URI: http://www.gmpf.co.uk/
 Description: Create Feeds for Google Merchant - promote your WooCommerce store on Google
-Version: 1.1.3
+Version: 1.1.4
 Author: Nick Vaughan
 Author URI: 

merchant-xml-feed-generator/trunk/readme.txt

@@ -45 +45 @@
 == Changelog ==
 
+= 1.4 =
+* Fixed in_array() expects parameter 2 to be array, boolean given  error
+* Fixed Invalid argument supplied for foreach() in shipping.php
+
 = 1.2 =
 * Fixed error when generating xml feed