clear notice, ref #1106

angelleye · Apr 26, 2018 · 0ece4b5 · 0ece4b5
1 parent 17be144
commit 0ece4b5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-helper-angelleye.php
@@ -875,11 +875,15 @@ public function angelleye_ajax_generate_cart() {
                 }
                 WC()->cart->calculate_totals();
             }
-            if (ob_get_length()) ob_end_clean();
+            if (ob_get_length()) {
+                ob_end_clean();
+            }
              ob_start();
             wp_send_json(array('url' => $url));
         } catch (Exception $ex) {
-            if (ob_get_length()) ob_end_clean();
+            if (ob_get_length()) {
+                ob_end_clean();
+            }
             ob_start();
             wp_send_json(array('url' => $url));
         } 

diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php
@@ -76,8 +76,10 @@ public function angelleye_redirect() {
                 WC()->session->set('is_smart_button_popup_closed', 'yes');
                 wc_clear_notices();
                 if (!empty($_REQUEST['request_from']) && $_REQUEST['request_from'] == 'JSv4') {
-                    if (ob_get_length()) ob_end_clean();
-                ob_start();
+                    if (ob_get_length()) {
+                        ob_end_clean();
+                    }
+                    ob_start();
                     wp_send_json(array(
                         'url' => $payPalURL
                     ));
@@ -91,7 +93,9 @@ public function angelleye_redirect() {
         $this->function_helper->ec_clear_session_data();
         if (!is_ajax()) {
             if (!empty($_REQUEST['request_from']) && $_REQUEST['request_from'] == 'JSv4') {
-                if (ob_get_length()) ob_end_clean();
+                if (ob_get_length()) {
+                    ob_end_clean();
+                }
                 ob_start();
                 if (wc_notice_count('error') > 0) {
                     wp_send_json(array(
@@ -111,7 +115,9 @@ public function angelleye_redirect() {
             }
         } else {
             if (!empty($_REQUEST['request_from']) && $_REQUEST['request_from'] == 'JSv4') {
-                if (ob_get_length()) ob_end_clean();
+                if (ob_get_length()) {
+                    ob_end_clean();
+                }
                 ob_start();
                 wp_send_json(array(
                     'url' => $payPalURL
@@ -123,7 +129,9 @@ public function angelleye_redirect() {
                     'redirect' => get_permalink(wc_get_page_id('cart')),
                 );
                 if ($this->function_helper->ec_is_version_gte_2_4()) {
-                    if (ob_get_length()) ob_end_clean();
+                    if (ob_get_length()) {
+                        ob_end_clean();
+                    }
                     ob_start();
                     wp_send_json($args);
                 } else {
@@ -137,7 +145,9 @@ public function angelleye_redirect_action($url) {
         if (!empty($url)) {
 
             if (!empty($_REQUEST['request_from']) && $_REQUEST['request_from'] == 'JSv4') {
-                if (ob_get_length()) ob_end_clean();
+                if (ob_get_length())  {
+                    ob_end_clean();
+                }
                 ob_start();
                 $query_str = parse_url($url, PHP_URL_QUERY);
                 parse_str($query_str, $query_params);
@@ -152,7 +162,9 @@ public function angelleye_redirect_action($url) {
                 wp_redirect($url);
                 exit;
             } else {
-                if (ob_get_length()) ob_end_clean();
+                if (ob_get_length())  {
+                    ob_end_clean();
+                }
                 ob_start();
                 $args = array(
                     'result' => 'success',
@@ -1486,8 +1498,10 @@ public function angelleye_wp_safe_redirect($url, $action = null) {
             exit;
         }
         if (!empty($_REQUEST['request_from']) && $_REQUEST['request_from'] == 'JSv4') {
-            if (ob_get_length()) ob_end_clean();
-                ob_start();
+            if (ob_get_length())  { 
+                ob_end_clean();
+            }
+            ob_start();
             wp_send_json(array(
                 'url' => $url
             ));