Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

first round of fixes #255

Browse Source
This commit is contained in:
Jonathan Labreuille
2015-12-07 16:54:08 +01:00
parent c0ba218949
commit 9fb04bc3c0
10 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Form/Widget.php
View File

@@ -36,9 +36,9 @@ class Widget extends \WP_Widget {
return parent::__construct(
'mailpoet_form',
__("MailPoet Subscription Form"),
__('MailPoet Form'),
array(
'title' => __("Newsletter subscription form"),
'description' => __('Add a newsletter subscription form.')
)
);
}
@@ -196,24 +196,6 @@ class Widget extends \WP_Widget {
}
}
// mailpoet shortcodes
// form shortcode
add_shortcode('mailpoet_form', 'mailpoet_form_shortcode');
add_shortcode('wysija_form', 'mailpoet_form_shortcode');
function mailpoet_form_shortcode($params = array()) {
// IMPORTANT: this is to make sure MagicMember won't scan our form and find [user_list] as a code they should replace.
remove_shortcode('user_list');
if(isset($params['id']) && (int)$params['id'] > 0) {
$form_widget = new \MailPoet\Form\Widget();
return $form_widget->widget(array(
'form' => (int)$params['id'],
'form_type' => 'shortcode'
));
}
}
// set the content filter to replace the shortcode
if(isset($_GET['mailpoet_page']) && strlen(trim($_GET['mailpoet_page'])) > 0) {
switch($_GET['mailpoet_page']) {