Changeset 13375 for trunk/wp-admin/includes/nav-menu.php

Timestamp:

02/24/2010 06:52:54 PM (16 years ago)

Author:

ryan

Message:

Nav menu cleanups. Props nbachiyski. see #11817

File:

• trunk/wp-admin/includes/nav-menu.php (modified) (9 diffs)

trunk/wp-admin/includes/nav-menu.php

@@ -30 +30 @@
     $pages_array = get_pages($pages_args);
 
-    $intCounter = $counter;
-    $parentli = $intCounter;
+    $items_counter = $counter;
+    $parentli = $items_counter;
 
     if ( !$pages_array ) {
-        echo 'Not Found';
-        return $intCounter;
+        echo __('Not Found');
+        return $items_counter;
     }
 
@@ -41 +41 @@
     foreach ( $pages_array as $post ) {
         if ( $post->post_parent == 0 ) {
-            $post = wp_setup_nav_menu_item($post, 'page', $intCounter);
+            $post = wp_setup_nav_menu_item($post, 'page', $items_counter);
             if ( $type == 'menu' ) {
                 ?>
 
-                <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
-                    <?php
-                        wp_print_nav_menu_item($post, 'menu', $intCounter);
+                <li id="menu-<?php echo $items_counter; ?>" value="<?php echo $items_counter; ?>">
+                    <?php
+                        wp_print_nav_menu_item($post, 'menu', $items_counter);
                         $parentli = $post->ID;
-                        $intCounter++;
-                        $intCounter = wp_custom_navigation_default_sub_items($post->ID, $intCounter, $parentli, 'pages', 'menu');
+                        $items_counter++;
+                        $items_counter = wp_custom_navigation_default_sub_items($post->ID, $items_counter, $parentli, 'pages', 'menu');
                     ?>
                 </li>
@@ -62 +62 @@
                         wp_print_nav_menu_item($post, 'default');
                         $parentli = $post->ID;
-                        $intCounter++;
-                        $intCounter = wp_nav_menu_sub_items($post->ID, $intCounter, $parentli, 'pages', 'default');
+                        $items_counter++;
+                        $items_counter = wp_nav_menu_sub_items($post->ID, $items_counter, $parentli, 'pages', 'default');
                      ?>
                 </li>
@@ -72 +72 @@
     }
 
-    return $intCounter;
+    return $items_counter;
 }
 
@@ -91 +91 @@
             'pad_counts'               => false );
 
-    $intCounter = $counter;
+    $items_counter = $counter;
 
     // Get all categories
@@ -98 +98 @@
     if ( !$categories_array ) {
         _e('Not Found');
-        return $intCounter;
+        return $items_counter;
     }
 
@@ -104 +104 @@
     foreach ( $categories_array as $cat_item ) {
         if ( $cat_item->parent == 0 ) {
-            $cat_item = wp_setup_nav_menu_item($cat_item, 'category', $intCounter);
+            $cat_item = wp_setup_nav_menu_item($cat_item, 'category', $items_counter);
             // Custom Menu
             if ( $type == 'menu' ) {
                 ?>
 
-                <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
+                <li id="menu-<?php echo $items_counter; ?>" value="<?php echo $items_counter; ?>">
                     <?php
                         wp_print_nav_menu_item($cat_item, 'menu');
                         $parentli = $cat_item->cat_ID;
-                        $intCounter++;
-                        $intCounter = wp_nav_menu_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories', 'menu');
+                        $items_counter++;
+                        $items_counter = wp_nav_menu_sub_items($cat_item->cat_ID, $items_counter, $parentli, 'categories', 'menu');
                     ?>
 
@@ -127 +127 @@
                         wp_print_nav_menu_item($cat_item, 'default');
                         $parentli = $cat_item->cat_ID;
-                        $intCounter++;
-                        $intCounter = wp_nav_menu_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories', 'default');
+                        $items_counter++;
+                        $items_counter = wp_nav_menu_sub_items($cat_item->cat_ID, $items_counter, $parentli, 'categories', 'default');
                     ?>
 
@@ -138 +138 @@
     }
 
-    return $intCounter;
+    return $items_counter;
 }
 
 //RECURSIVE Sub Menu Items of default categories and pages
-function wp_nav_menu_sub_items($childof, $intCounter, $parentli, $type, $output_type) {
-
-    $counter = $intCounter;
+function wp_nav_menu_sub_items($childof, $items_counter, $parentli, $type, $output_type) {
+
+    $counter = $items_counter;
 
     // Custom Menu