Changeset 1887530

Timestamp:

06/05/2018 01:29:43 PM (8 years ago)

Author:

apeschar

Message:

Update plugin

Location:

webwinkelkeur/trunk

Files:

• common/woocommerce.php (modified) (4 diffs)
• readme.txt (modified) (1 diff)
• webwinkelkeur.php (modified) (1 diff)

webwinkelkeur/trunk/common/woocommerce.php

@@ -68 +68 @@
         $with_order_data = !get_option($this->get_option_name('limit_order_data')) && is_callable([$order, 'get_data']);
         if ($with_order_data) {
-            $order_arr = $order->get_data();
-            $customer_arr = $order_arr['customer_id'] ? (new WC_Customer($order_arr['customer_id']))->get_data() : [];
+            $order_arr = $this->get_data($order, []);
+            $customer_arr = !empty($order_arr['customer_id']) ? $this->get_data(new WC_Customer($order_arr['customer_id']), []) : [];
             $pf = new WC_Product_Factory();
+            $products = [];
             foreach ($order_arr['line_items'] as $line_item) {
                 $product = $pf->get_product($line_item['product_id']);
@@ -76 +77 @@
                     continue;
                 }
-                $product_arr = $product->get_data();
+                $product_arr = $this->get_data($product, []);
                 $images = get_attached_media('image', $product->get_id());
                 foreach ($images as $image) {
                     $product_arr['product_image'][] = wp_get_attachment_image_src($image->ID, 'full')[0];
                 }
+                $products[] = $product_arr;
             }
             $order_data = [
                 'order' => $order_arr,
                 'customer' => $customer_arr,
-                'products' => $product_arr,
+                'products' => $products,
                 'invoice_address' => $invoice_address,
                 'delivery_address' => $delivery_address,
@@ -142 +144 @@
         }
         if (is_callable([$value, 'get_data'])) {
-            return $this->filter_data(@$value->get_data());
+            return $this->get_data($value);
         }
         if (is_callable([$value, '__toString'])) {
@@ -152 +154 @@
         return $value;
     }
+
+    private function get_data($value, $default = null) {
+        if (!is_callable([$value, 'get_data']) || !is_object($value)) {
+            return $default;
+        }
+        $method = new ReflectionMethod($value, 'get_data');
+        if ($method->getNumberOfRequiredParameters() > 0) {
+            return $default;
+        }
+        return @$value->get_data();
+    }
 }

webwinkelkeur/trunk/readme.txt

@@ -28 +28 @@
 
 == Changelog ==
+
+= 1.6.7 =
+* Check required parameters before calling get_data().
 
 = 1.6.6 =

webwinkelkeur/trunk/webwinkelkeur.php

@@ -4 +4 @@
 Plugin URI: https://www.webwinkelkeur.nl/webwinkel/mogelijkheden/wordpress-module/
 Description: De WordPress plugin zorgt voor een eenvoudige integratie van het WebwinkelKeur binnen jouw webwinkel. Hiermee is het heel eenvoudig om de innovatieve <a href="https://www.webwinkelkeur.nl/webwinkel/mogelijkheden/sidebar/">WebwinkelKeur Sidebar</a> in jouw WordPress website of WooCommerce webwinkel te integreren. Wanneer je WooCommerce gebruikt, kunnen er bovendien automatisch uitnodigingen naar je klanten worden gestuurd.
-Version: v1.6.6
+Version: v1.6.7
 Author: Albert Peschar
 Author URI: https://peschar.net/