Fixed fatal error when fetching tags, updated readme, version bump

katzwebservices · Feb 13, 2014 · 36bca9b · 36bca9b
1 parent 453ba93
commit 36bca9b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/trunk/cf7-constantcontact.php b/trunk/cf7-constantcontact.php
@@ -5,10 +5,10 @@
 Description: Add the power of Constant Contact to Contact Form 7
 Author: Katz Web Services, Inc.
 Author URI: http://www.katzwebservices.com
-Version: 2.0.4
+Version: 2.0.5
 */
 
-/*  Copyright 2013 Katz Web Services, Inc. (email: [email protected])
+/*  Copyright 2014 Katz Web Services, Inc. (email: [email protected])
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ class CTCTCF7 {
 	 * The current version of the plugin.
 	 * @var string
 	 */
-	private static $version = '2.0.4';
+	private static $version = '2.0.5';
 
 	function __construct() {
 

diff --git a/trunk/readme.txt b/trunk/readme.txt
@@ -1,9 +1,9 @@
 === Contact Form 7 Newsletter ===
 Contributors: katzwebservices, katzwebdesign
 Donate link:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zackkatz%40gmail%2ecom&item_name=Constant%20Form%207%20Constant%20Contact%20Module
-Tags: Constant Contact, Contact Form 7, ContactForm7, Contact Form, Newsletter, Opt In, Email Marketing, form, signup, email newsletter form, newsletter form, newsletter signup, email marketing
+Tags: Contact Form 7, ContactForm7, Constant Contact, Contact Form, Newsletter, Opt In, Email Marketing, form, signup, email newsletter form, newsletter form, newsletter signup, email marketing
 Requires at least: 3.2
-Tested up to: 3.6.1
+Tested up to: 3.8.1
 Stable tag: trunk
 License: GPLv2 or later
 
@@ -82,6 +82,9 @@ function remove_CTCTCF7_presstrends_plugin() {
 
 == Changelog ==
 
+= 2.0.5 (February 13, 2014) =
+* Fixed: Fatal error causing incomplete loading of form pages. Thanks, [liyo](https://github.com/liyo)
+
 = 2.0 through 2.0.4 =
 * Brand-new way of integrating with Contact Form 7 forms! You no longer need to copy and paste form fields. Now there's a simple drop-down menu to pick your Integration Fields.
 * Added: When a form is connected to Constant Contact, you will see an icon
@@ -123,6 +126,9 @@ function remove_CTCTCF7_presstrends_plugin() {
 
 == Upgrade Notice ==
 
+= 2.0.5 (February 13, 2014) =
+* Fixed: Fatal error causing incomplete loading of form pages. Thanks, [liyo](https://github.com/liyo)
+
 = 2.0 through 2.0.4 =
 * Brand-new way of integrating with Contact Form 7 forms! You no longer need to copy and paste form fields. Now there's a simple drop-down menu to pick your Integration Fields.
 * Added: When a form is connected to Constant Contact, you will see an icon

diff --git a/trunk/shortcode.php b/trunk/shortcode.php
@@ -35,10 +35,11 @@ function ajax_generate_dropdowns_from_code() {
 		// Process the form code
 		$WPCF7_ShortcodeManager->do_shortcode($code, false);
 		$output = array(
-			'' => __('Select a Field')
+			'' => __('Select a Field', 'ctctcf7')
 		);
-		if(count($WPCF7_ShortcodeManager->get_scanned_tags())) {
-			foreach ( $WPCF7_ShortcodeManager->scanned_tags as $fe ) {
+		$scanned_form_tags = $WPCF7_ShortcodeManager->get_scanned_tags();
+		if(count($scanned_form_tags)) {
+			foreach ( $scanned_form_tags as $fe ) {
 				if ( empty( $fe['name'] ) )
 					continue;