From affe48311a9a6229f5d5fcf9ad125beca89d3317 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Wed, 20 Apr 2016 17:18:02 -0400
Subject: [PATCH] Menu restructure

---
 index.php                     | 6 ++----
 views/admin/sample/index.html | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index daaecd1..7bb488f 100644
--- a/index.php
+++ b/index.php
@@ -120,7 +120,7 @@ function glmMembersSamplePluginRequired() {
         </div>
     ';
 }
-$plugin_name = 'glm-member-db/glm-member-db.php';
+$plugin_name = 'glm-member-db/index.php';
 $is_active = is_plugin_active($plugin_name);
 if ($is_active != '1') {
     add_action( 'admin_notices', 'glmMembersSamplePluginRequired' );
@@ -150,10 +150,8 @@ if (version_compare($glmMembersDatabasePluginVersion, GLM_MEMBERS_SAMPLE_PLUGIN_
  */
 require_once(GLM_MEMBERS_SAMPLE_PLUGIN_SETUP_PATH.'/validActions.php');
 require_once(GLM_MEMBERS_SAMPLE_PLUGIN_SETUP_PATH.'/shortcodes.php');
-$havePluginDatabase = false;
 if (is_file(GLM_MEMBERS_SAMPLE_PLUGIN_DB_SCRIPTS.'/dbVersions.php')) {
     require_once(GLM_MEMBERS_SAMPLE_PLUGIN_DB_SCRIPTS.'/dbVersions.php');
-    $havePluginDatabase = true;
 }
 
 // Load Sample Management Settings data
@@ -178,7 +176,7 @@ function glmMembersRegisterSample($addOns) {
     );
 
     // If we have database tables for this plugin/addon, provide that data also
-    if ($GLOBALS['havePluginDatabase']) {
+    if (isset($GLOBALS['glmMembersSampleDbVersions'])) {
         $addOns[GLM_MEMBERS_SAMPLE_PLUGIN_SLUG]['database'] = array(
             'dbPrefix' => GLM_MEMBERS_SAMPLE_PLUGIN_DB_PREFIX,
             'dbCurrentVersion' => GLM_MEMBERS_SAMPLE_PLUGIN_DB_VERSION,
diff --git a/views/admin/sample/index.html b/views/admin/sample/index.html
index 4588ef0..4185932 100644
--- a/views/admin/sample/index.html
+++ b/views/admin/sample/index.html
@@ -2,6 +2,6 @@
     <div id="glm-admin-content-container">
         <h3>Sample Model</h3>
         <p>{$displayData}</p>
-        <a href="{$thisURL}?page={$thisPage}&glm_action=more">Click me to see more!</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=more">Click me to see more!</a>
     </div>
 </div>
\ No newline at end of file
-- 
2.17.1