Updates to 1.9.49

pronamic · Oct 21, 2022 · e07be7e · e07be7e
1 parent 0e9aaac
commit e07be7e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/app/gateways/MeprPayPalCommerceGateway.php b/app/gateways/MeprPayPalCommerceGateway.php
@@ -136,7 +136,7 @@ protected function set_defaults() {
     } else {
       $this->settings->url          = 'https://ipnpb.paypal.com/cgi-bin/webscr';
       $this->settings->api_url      = 'https://api-3t.paypal.com/nvp';
-      $this->settings->rest_api_url = 'https://api-m.paypal.com';
+      $this->settings->rest_api_url = 'https://api.paypal.com';
     }
 
     $this->settings->api_version = 69;

diff --git a/app/integrations/google-captcha/Integration.php b/app/integrations/google-captcha/Integration.php
@@ -49,6 +49,10 @@ public function add_recaptcha() {
   }
 
   public function verify_recaptcha($errors) {
+    if(wp_doing_ajax() && isset($_GET['action']) && $_GET['action'] == 'mepr_paypal_commerce_create_smart_button') {
+      return $errors;
+    }
+
     $is_valid = apply_filters('gglcptch_verify_recaptcha', true);
 
     if(!$is_valid) {

diff --git a/app/lib/MeprSubscriptionsTable.php b/app/lib/MeprSubscriptionsTable.php
@@ -59,14 +59,14 @@ public function __construct($screen, $columns, $lifetime=false) {
       'subscription' => 'sub.subscr_id',
       'username' => 'u.user_login',
       'email' => 'u.user_email',
-      'id' => 'sub.ID',
+      'id' => 'sub.id',
     );
 
     $this->non_recurring_db_search_cols = array(
       'subscription' => 'txn.trans_num',
       'username' => 'u.user_login',
       'email' => 'u.user_email',
-      'id' => 'sub.ID',
+      'id' => 'txn.id',
     );
 
     parent::__construct(

diff --git a/i18n/memberpress.pot b/i18n/memberpress.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the MemberPress plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: MemberPress 1.9.48\n"
+"Project-Id-Version: MemberPress 1.9.49\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/memberpress\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-10-17T16:17:38+00:00\n"
+"POT-Creation-Date: 2022-10-20T13:55:54+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
 "X-Domain: memberpress\n"
@@ -4790,7 +4790,7 @@ msgstr ""
 msgid "MemberPress forgot password form"
 msgstr ""
 
-#: app/integrations/google-captcha/Integration.php:55
+#: app/integrations/google-captcha/Integration.php:59
 msgid "Captcha verification failed"
 msgstr ""
 

diff --git a/memberpress.php b/memberpress.php
@@ -3,7 +3,7 @@
 Plugin Name: MemberPress Pro 30 (Legacy)
 Plugin URI: http://www.memberpress.com/
 Description: The membership plugin that makes it easy to accept payments for access to your content and digital products.
-Version: 1.9.48
+Version: 1.9.49
 Author: Caseproof, LLC
 Author URI: http://caseproof.com/
 Text Domain: memberpress