updating the login redirect urls, removing extraneous menu calls

diff --git a/functions.php b/functions.php
index dc6c9aa..ae30a6b 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -275,7 +275,7 @@ define( 'OPTIONS_FRAMEWORK_DIRECTORY', get_template_directory_uri() . '/inc/opti
 
 function add_logout($items, $args) {
     $url =  wp_logout_url( home_url() );
-    if( $args->theme_location == 'demo' ){
+    if( $args->theme_location == 'primary' ){
     $items .= "<li class='menu-item menu-logout'>"
             . "<a class='button glm-button' href='$url'>Logout</a>"
             . "</li>";

diff --git a/header.php b/header.php
index d4ee71b..4c8ab33 100644 (file)
--- a/header.php
+++ b/header.php
@@ -70,12 +70,6 @@
                <div class="menu-toggle">d<?php _e( 'Menu', 'accesspress-parallax' ); ?></div>
                
             <?php
-            // wp_nav_menu( array( 
-                       //      'theme_location' => 'login' , 
-                       //      'container'      => false
-            // ) ); 
-
-            
                        $sections = of_get_option('parallax_section');
                        if((of_get_option('enable_parallax') == 1 && of_get_option('enable_parallax_nav') == 1) || (is_page_template('home-page.php') && of_get_option('enable_parallax_nav') == 1)):
                        ?>
@@ -109,18 +103,11 @@
             <?php      
             
             else: 
-            
-                if($page === 'demo' || $page === "my-courses" || $type === "cmvl_channel"){
-                    wp_nav_menu( array( 
-                        'theme_location' => 'demo' , 
-                        'container'      => false
-                    ) );
-                }else {
                     wp_nav_menu( array( 
                         'theme_location' => 'primary' , 
                         'container'      => false
                     ) );
-                }
+           
                                
                        endif; ?>
                

diff --git a/inc/glm-dev.php b/inc/glm-dev.php
index c0676f8..48febcc 100644 (file)
--- a/inc/glm-dev.php
+++ b/inc/glm-dev.php
@@ -7,7 +7,7 @@ function glm_login_form( $atts ){
             $args = array(
                 'echo'           => false,
                 'form_id'        => 'glm_login_form',
-                'redirect'       => get_permalink(195),
+                'redirect'       => get_permalink(414),
             );
             $loginForm = wp_login_form($args);
             $captcha   = apply_filters('cptch_display', '', 'glm_login_form');