Remove front page from top nav - 2

diff --git a/functions.php b/functions.php
index fb1124a..296f5eb 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -66,22 +66,23 @@ function glm_page_menu($parent = 0, $class = '')
     echo '<ul'.(($class)?' class="'.$class.'"':'').'><!-- begin -->'."\n";
     foreach ($pages as $page) {
         $childs = get_pages('child_of=' . $page->ID);
-        if (is_page('Front Page')) {
-            return;
-        }
-        if (count($childs) > 0) {
-            echo '<li class="has-dropdown">'."\n";
-            echo '<a href="'.get_permalink($page->ID).'">'.$page->post_title.'</a>'."\n";
-            echo glm_page_menu($page->ID, 'sub-menu dropdown');
-            echo '</li>'."\n";
+        if (!is_page('Front Page')) {
+            if (count($childs) > 0) {
+                echo '<li class="has-dropdown">'."\n";
+                echo '<a href="'.get_permalink($page->ID).'">'.$page->post_title.'</a>'."\n";
+                echo glm_page_menu($page->ID, 'sub-menu dropdown');
+                echo '</li>'."\n";
+            } else {
+                echo '<li';
+    //            if ($page->ID == $frontPageId) {
+    //                echo ' id="logo"';
+    //            }
+                echo '><a href="'.get_permalink($page->ID).'">';
+                echo ($page->ID == $frontPageId) ? '<img src="'.get_bloginfo('template_url').'/assets/head-logo.png">': $page->post_title;
+                echo '</a></li>'."\n";
+            }
         } else {
-            echo '<li';
-//            if ($page->ID == $frontPageId) {
-//                echo ' id="logo"';
-//            }
-            echo '><a href="'.get_permalink($page->ID).'">';
             echo ($page->ID == $frontPageId) ? '<img src="'.get_bloginfo('template_url').'/assets/head-logo.png">': $page->post_title;
-            echo '</a></li>'."\n";
         }
     }
     echo '</ul><!-- end -->'."\n";