Merge conflict got into last hotfix in frontHooks.php. Fixed

diff --git a/index.php b/index.php
index 5383c76..ead861b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database Packaging
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 1.1.9
+ * Version: 1.1.10
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabasePackagingAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.1.9
+ * @version 1.1.10
  */
 
 /*
@@ -37,7 +37,7 @@
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.9');
+define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.10');
 define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.2');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.

diff --git a/setup/frontHooks.php b/setup/frontHooks.php
index 3aa3a09..d454006 100644 (file)
--- a/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@ -78,17 +78,11 @@ if (strpos(GLM_MEMBERS_PLUGIN_CURRENT_URL, $this->config['settings']['canonical_
     global $wpdb;
     $GLOBALS['glmPackageName'] = $wpdb->get_var( "SELECT title FROM ".GLM_MEMBERS_PACKAGING_PLUGIN_DB_PREFIX . "packages WHERE package_slug = '".$GLOBALS['glmDetailSlug']."'" );
 
-<<<<<<< Updated upstream
     // Set the page title to the event name - Using low priority so it's the last to set the title!
     add_filter('wp_title', function($title) {
         return $GLOBALS['glmPackageName'];
     }, 99, 1);
-=======
-    // Set the page title to the event name
-    add_filter('wp_title', function() {
-        return $GLOBALS['glmPackageName'];
-    });
->>>>>>> Stashed changes
+
 }
 
 // Add package slug query var