Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 17 May 2016 13:23:10 +0000 (09:23 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 17 May 2016 13:23:10 +0000 (09:23 -0400)
Conflicts:
models/admin/management/index.php

1  2 
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'][]
              }