Merge pull request #8 from jaredcobb/1.0.2

Remove new array syntax on main plugin file, fix subdomain validation

README.txt

@@ -2,8 +2,8 @@
 Contributors: jaredcobb
 Tags: ccb, church, api, chms
 Requires at least: 4.6.0
-Tested up to: 4.9.1
-Stable tag: 1.0.1
+Tested up to: 4.9.2
+Stable tag: 1.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -61,6 +61,10 @@ You'll need to ensure your [group settings](https://churchcommunitybuilder.force
 
 == Changelog ==
 
+= 1.0.2 =
+* Fixed a bug to allow subdomains with dashes
+* Remove PHP 5.4 array syntax from the main plugin file (prevent crashes on PHP < 5.4)
+
 = 1.0.1 =
 * Fixed a bug where terms are not populated in some circumstances
 * Added checks for minimum PHP and WordPress versions to prevent crashes

ccb-core.php

@@ -10,7 +10,7 @@
  * Plugin Name:       Church Community Builder Core API
  * Plugin URI:        https://www.wpccb.com
  * Description:       A plugin to provide a core integration of the Church Community Builder API into WordPress custom post types
- * Version:           1.0.1
+ * Version:           1.0.2
  * Author:            Jared Cobb
  * Author URI:        https://www.jaredcobb.com/
  * License:           GPL-2.0+
@@ -27,7 +27,7 @@
 define( 'CCB_CORE_PATH', plugin_dir_path( __FILE__ ) );
 define( 'CCB_CORE_URL', plugin_dir_url( __FILE__ ) );
 define( 'CCB_CORE_BASENAME', plugin_basename( __FILE__ ) );
-define( 'CCB_CORE_VERSION', '1.0.1' );
+define( 'CCB_CORE_VERSION', '1.0.2' );
 
 // Check minimum requirements before proceeding.
 require_once CCB_CORE_PATH . 'includes/class-ccb-core-requirements.php';
@@ -37,8 +37,8 @@
 
 	// Code that runs during plugin activation and deactivation.
 	require_once CCB_CORE_PATH . 'includes/class-ccb-core-activator.php';
-	register_activation_hook( __FILE__, [ 'CCB_Core_Activator', 'activate' ] );
-	register_deactivation_hook( __FILE__, [ 'CCB_Core_Activator', 'deactivate' ] );
+	register_activation_hook( __FILE__, array( 'CCB_Core_Activator', 'activate' ) );
+	register_deactivation_hook( __FILE__, array( 'CCB_Core_Activator', 'deactivate' ) );
 
 	// Internationalization, dashboard-specific hooks, and public-facing site hooks.
 	require_once CCB_CORE_PATH . 'includes/class-ccb-core.php';

includes/class-ccb-core-settings.php

@@ -170,7 +170,7 @@ public function get_settings_definitions() {
 								'field_title' => esc_html__( 'Software Subdomain', 'ccb-core' ),
 								'field_render_function' => 'render_text',
 								'field_placeholder' => 'subdomain',
-								'field_validation' => 'alphanumeric',
+								'field_validation' => 'slug',
 								'field_tooltip' => esc_html__( 'We just need the first part of your software URL (without "http://" and without ".ccbchurch.com").', 'ccb-core' ),
 							],
 							'credentials' => [