Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ruN .\woocommerce-gateway-paypal-powered-by-braintree_original\/vendor/braintree/braintree_php/lib/Braintree/GraphQLClient.php .\woocommerce-gateway-paypal-powered-by-braintree\/vendor/braintree/braintree_php/lib/Braintree/GraphQLClient.php
- --- .\woocommerce-gateway-paypal-powered-by-braintree_original\/vendor/braintree/braintree_php/lib/Braintree/GraphQLClient.php 2022-10-12 06:11:06.000000000 +0900
- +++ .\woocommerce-gateway-paypal-powered-by-braintree\/vendor/braintree/braintree_php/lib/Braintree/GraphQLClient.php 2024-10-07 15:33:46.210559000 +0900
- @@ -8,6 +8,10 @@
- */
- class GraphQLClient
- {
- +
- + public $_service;
- +
- +
- // phpcs:ignore PEAR.Commenting.FunctionComment.Missing
- public function __construct($config)
- {
- diff -ruN .\woocommerce-gateway-paypal-powered-by-braintree_original\/vendor/skyverge/wc-plugin-framework/woocommerce/class-sv-wc-helper.php .\woocommerce-gateway-paypal-powered-by-braintree\/vendor/skyverge/wc-plugin-framework/woocommerce/class-sv-wc-helper.php
- --- .\woocommerce-gateway-paypal-powered-by-braintree_original\/vendor/skyverge/wc-plugin-framework/woocommerce/class-sv-wc-helper.php 2024-03-11 19:43:32.000000000 +0900
- +++ .\woocommerce-gateway-paypal-powered-by-braintree\/vendor/skyverge/wc-plugin-framework/woocommerce/class-sv-wc-helper.php 2024-10-07 19:47:55.464158200 +0900
- @@ -708,7 +708,7 @@
- */
- public static function wc_add_notice( $message, $notice_type = 'success' ) {
- - if ( function_exists( 'wc_add_notice' ) ) {
- + if ( function_exists( 'wc_add_notice' ) && isset( WC()->session ) ) {
- wc_add_notice( $message, $notice_type );
- }
- }
- C:\Program Files\KDiff3\bin\diff.exe: .\woocommerce-gateway-paypal-powered-by-braintree_original\/vendor/skyverge/wc-plugin-framework/woocommerce/payment-gateway/api: No such file or directory
- diff -ruN .\woocommerce-gateway-paypal-powered-by-braintree_original\/vendor/skyverge/wc-plugin-framework/woocommerce/payment-gateway/class-sv-wc-payment-gateway-direct.php .\woocommerce-gateway-paypal-powered-by-braintree\/vendor/skyverge/wc-plugin-framework/woocommerce/payment-gateway/class-sv-wc-payment-gateway-direct.php
- --- .\woocommerce-gateway-paypal-powered-by-braintree_original\/vendor/skyverge/wc-plugin-framework/woocommerce/payment-gateway/class-sv-wc-payment-gateway-direct.php 2024-03-11 19:43:32.000000000 +0900
- +++ .\woocommerce-gateway-paypal-powered-by-braintree\/vendor/skyverge/wc-plugin-framework/woocommerce/payment-gateway/class-sv-wc-payment-gateway-direct.php 2024-10-07 18:16:13.849491800 +0900
- @@ -476,12 +476,15 @@
- $messages = [];
- - if ( function_exists( 'wc_get_notices' ) && ( $notices = wc_get_notices( $type ) ) ) {
- - foreach ( $notices as $notice ) {
- - $message = $notice['notice'] ?? $notice;
- + if ( function_exists( 'wc_get_notices' ) && isset( WC()->session ) ) {
- + $notices = wc_get_notices( $type );
- + if ( isset( $notices ) && is_array( $notices ) ) {
- + foreach ( $notices as $notice ) {
- + $message = $notice['notice'] ?? $notice;
- - // this will handle some log data eventually
- - $messages[] = htmlspecialchars( is_array( $message ) ? print_r( $message, true ) : $message );
- + // this will handle some log data eventually
- + $messages[] = htmlspecialchars( is_array( $message ) ? print_r( $message, true ) : $message );
- + }
- }
- }
Advertisement
Add Comment
Please, Sign In to add comment