From 9d358f74ddb0d9023123ac702ca5c21aaac2b559 Mon Sep 17 00:00:00 2001
From: Alexey Stoletniy <stoletniy@gmail.com>
Date: Wed, 5 Apr 2017 18:35:13 +0300
Subject: [PATCH] Rename a 'method' field in a form widget so it doesn't break
 the WP interactive customizer [MAILPOET-851]

---
 lib/API/API.php        | 9 +++++++--
 views/form/widget.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/API/API.php b/lib/API/API.php
index ce86f0ce0e..030ffdd408 100644
--- a/lib/API/API.php
+++ b/lib/API/API.php
@@ -64,9 +64,13 @@ class API {
     $this->_endpoint = isset($data['endpoint'])
       ? Helpers::underscoreToCamelCase(trim($data['endpoint']))
       : null;
-    $this->_method = isset($data['method'])
-      ? Helpers::underscoreToCamelCase(trim($data['method']))
+
+    // JS part of /wp-admin/customize.php does not like a 'method' field in a form widget
+    $method_param_name = isset($data['mailpoet_method']) ? 'mailpoet_method' : 'method';
+    $this->_method = isset($data[$method_param_name])
+      ? Helpers::underscoreToCamelCase(trim($data[$method_param_name]))
       : null;
+
     $this->_token = isset($data['token'])
       ? trim($data['token'])
       : null;
@@ -100,6 +104,7 @@ class API {
           'token',
           'endpoint',
           'method',
+          'mailpoet_method', // alias of 'method'
           'mailpoet_redirect'
         );
         $this->_data = array_diff_key(
diff --git a/views/form/widget.html b/views/form/widget.html
index e94cb620de..4a8a8f24c4 100644
--- a/views/form/widget.html
+++ b/views/form/widget.html
@@ -16,7 +16,7 @@
       <input type="hidden" name="form_id" value="<%= form.id %>" />
       <input type="hidden" name="token" value="<%= token %>" />
       <input type="hidden" name="endpoint" value="subscribers" />
-      <input type="hidden" name="method" value="subscribe" />
+      <input type="hidden" name="mailpoet_method" value="subscribe" />
 
       <%= html | raw %>
       <div class="mailpoet_message">