From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 17 May 2016 13:23:10 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
X-Git-Tag: v2.0.0^2~16
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=55b5405f82fb1478b275649679616a6a03cd069a;p=WP-Plugins%2Fglm-member-db.git

Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

Conflicts:
	models/admin/management/index.php
---

55b5405f82fb1478b275649679616a6a03cd069a
diff --cc models/admin/management/index.php
index ea41823a,a4f002d3..9331d10a
--- a/models/admin/management/index.php
+++ b/models/admin/management/index.php
@@@ -129,11 -129,13 +129,11 @@@ class GlmMembersAdmin_management_index 
              if (isset($a['requiredPages'])) {
                  foreach($a['requiredPages'] as $pageName => &$pageData) {
                      //echo $pageName;
-                     $pageID = get_option(GLM_MEMBERS_PLUGIN_OPTION_PREFIX.$pageData['underscored_name']);
+                     $pageID = get_option(GLM_MEMBERS_PLUGIN_OPTION_PREFIX.$pageData['underscored_title']);
                      $pageData['id'] = $pageID;
-                     $pageData['slug'] = sanitize_title($pageData['name']);;
+                     $pageData['slug'] = sanitize_title($pageData['title']);;
 -                    echo get_the_title($pageID);
 -                    //$pageData['name'] = single_post_title(get_post(get_option($pageID)));
                  }
-                 $requiredPages[$a['underscored_name']] = $a['requiredPages'];
+                 $requiredPages[$a['underscored_title']] = $a['requiredPages'];
  
                  //$a['requiredPages'][]
              }