Editor button was outputting the wrong shortcode.

lesterchan · Apr 22, 2014 · 2d9c2e5 · 2d9c2e5
1 parent 0173e94
commit 2d9c2e5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ WP-Polls is extremely customizable via templates and css styles and there are to
 ## Changelog
 
 ### Version 2.66
+* FIXED: Editor button was outputting the wrong shortcode.
 * FIXED: ReferenceError: pollsEdL10n is not defined if TinyMCE 4.0 is loaded outside the Add/Edit Posts/Pages.
 
 ### Version 2.65

diff --git a/tinymce/plugins/polls/plugin.js b/tinymce/plugins/polls/plugin.js
@@ -6,7 +6,7 @@
 				poll_id = jQuery.trim(prompt(tinymce.translate('Error: Poll ID must be numeric') + "\n\n" + tinymce.translate('Please enter Poll ID again')));
 			}
 			if (poll_id >= -1 && poll_id != null && poll_id != "") {
-				editor.insertContent('[poll="' + poll_id + '"]');
+				editor.insertContent('[poll id="' + poll_id + '"]');
 			}
 		});
 		editor.addButton('polls', {

diff --git a/tinymce/plugins/polls/plugin.min.js b/tinymce/plugins/polls/plugin.min.js
diff --git a/wp-polls.php b/wp-polls.php
@@ -261,7 +261,7 @@ function poll_footer_admin() {
 				poll_id = jQuery.trim(prompt("<?php echo esc_js(__('Error: Poll ID must be numeric', 'wp-polls')); ?>\n\n<?php echo esc_js(__('Please enter Poll ID again', 'wp-polls')); ?>"));
 			}
 			if (poll_id >= -1 && poll_id != null && poll_id != "") {
-				QTags.insertContent('[poll="' + poll_id + '"]');
+				QTags.insertContent('[poll id="' + poll_id + '"]');
 			}
 		});
 	</script>