Changeset 13336 for trunk/wp-includes/default-widgets.php

Timestamp:

02/23/2010 07:28:41 PM (15 years ago)

Author:

ryan

Message:

More output consolidation. see #11817

File:

• trunk/wp-includes/default-widgets.php (modified) (12 diffs)

trunk/wp-includes/default-widgets.php

@@ -1045 +1045 @@
 
     function WP_CustomNavWidget() {
-        $widget_ops = array('description' => 'Use this widget to add one of your Custom Navigation Menus as a widget.' );
-        parent::WP_Widget(false, __('Custom Navigation Menu'),$widget_ops);
+        $widget_ops = array('description' => __('Use this widget to add one of your Custom Navigation Menus as a widget.') );
+        parent::WP_Widget(false, __('Custom Navigation Menu'), $widget_ops);
     }
 
@@ -1060 +1060 @@
         $navulclass = $instance['navulclass'];
 
-        //Override for menu descriptions
+        // Override for menu descriptions
         $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options');
-        if ($advanced_option_descriptions == 'no')
-        {
+        if ( $advanced_option_descriptions == 'no' ) {
             $navwidgetdescription = 2;
-        }
-        else
-        {
+        } else {
             $navwidgetdescription = $instance['navwidgetdescription'];
         }
@@ -1074 +1071 @@
         global $wpdb;
 
-        //GET menu name
-        if ($navmenu > 0)
-        {
-            $table_name_menus = $wpdb->prefix . "custom_nav_menus";
-            $wp_result = $wpdb->get_results("SELECT menu_name FROM ".$table_name_menus." WHERE id='".$navmenu."'");
-            $wp_custom_nav_menu_name = $wp_result[0]->menu_name;
+        // GET menu name
+        if ( $navmenu > 0 ) {
+            $custom_menu = get_term( (int) $nav_menu, 'nav_menu' );
+            $wp_custom_nav_menu_name = $custom_menu->name;
             $menuexists = true;
-        }
-        //Do nothing
-        else
-        {
+        } else {
             $menuexists = false;
         }
@@ -1091 +1083 @@
         <?php
             //DEVELOPER settings enabled
-            if ($navdeveloper == 'yes')
-            {
+            if ( $navdeveloper == 'yes' ) {
                 //DISPLAY Custom DIV
-                if ($navdiv == 'yes')
-                {
+                if ( $navdiv == 'yes' ) {
                     ?>
                     <div id="<?php echo $navdivid;  ?>" class="<?php echo $navdivclass; ?>">
                     <?php
                 }
-                //Do NOT display DIV
-                else
-                {
-
-                }
-
             }
             //DISPLAY default DIV
-            else
-            {
+            else {
                 ?>
                 <div class="widget">
@@ -1119 +1102 @@
             <?php
 
-            if ($menuexists)
-            {
+            if ( $menuexists ) {
                 ?>
                 <?php
 
                 //DEVELOPER settings enabled
-                if ($navdeveloper == 'yes')
-                {
+                if ( $navdeveloper == 'yes' ) {
                     //DISPLAY Custom UL
-                    if ($navul == 'yes')
-                    {
+                    if ( $navul == 'yes' ) {
                         ?>
                         <ul id="<?php echo $navulid;  ?>" class="<?php echo $navulclass; ?>">
                         <?php
                     }
-                    //Do NOT display UL
-                    else
-                    {
-
-                    }
-
                 }
                 //DISPLAY default UL
-                else
-                {
+                else {
                     ?>
                     <ul class="custom-nav">
@@ -1153 +1126 @@
                         <?php
                             //DISPLAY custom navigation menu
-                            if (get_option('wp_custom_nav_menu') == 'true') {
-                                custom_nav('name='.$wp_custom_nav_menu_name.'&desc='.$navwidgetdescription);
-                            }
+                            if ( get_option('wp_custom_nav_menu') == 'true' )
+                                custom_nav( array('id' => $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription) );
                         ?>
 
@@ -1161 +1133 @@
 
                     //DEVELOPER settings enabled
-                    if ($navdeveloper == 'yes')
-                    {
+                    if ( $navdeveloper == 'yes' ) {
                         //DISPLAY Custom UL
-                        if ($navul == 'yes')
-                        {
+                        if ( $navul == 'yes' ) {
                             ?>
                             </ul>
                             <?php
                         }
-                        //Do NOT display UL
-                        else
-                        {
-
-                        }
-
                     }
                     //DISPLAY default UL
-                    else
-                    {
+                    else {
                         ?>
                         </ul>
@@ -1187 +1150 @@
                 ?>
             <?php
-            }
-            else
-            {
-                echo "You have not setup the custom navigation widget correctly, please check your settings in the backend.";
+            } else {
+                _e('You have not setup the custom navigation widget correctly, please check your settings in the backend.');
             }
             ?>
         <?php
             //DEVELOPER settings enabled
-            if ($navdeveloper == 'yes')
-            {
+            if ($navdeveloper == 'yes') {
                 //DISPLAY Custom DIV
                 if ($navdiv == 'yes')
@@ -1241 +1201 @@
         global $wpdb;
 
-        //GET Menu Items for SELECT OPTIONS
-        $table_name_custom_menus = $wpdb->prefix . "custom_nav_menus";
-        $custom_menu_records = $wpdb->get_results("SELECT id,menu_name FROM ".$table_name_custom_menus);
-
-        //CHECK if menus exist
-        if ($custom_menu_records > 0)
-        {
-
+        // Get menus
+        $custom_menus = get_terms( 'nav_menu', array( 'hide_empty' => false ) );
+
+        if ( $custom_menus ) {
             ?>
 
@@ -1258 +1214 @@
 
                     //DISPLAY SELECT OPTIONS
-                    foreach ($custom_menu_records as $custom_menu_record)
-                    {
-                        if ($navmenu == $custom_menu_record->id) {
+                    foreach ( $custom_menus as $menu ) {
+                        if ( $navmenu == $menu->term_id) {
                             $selected_option = 'selected="selected"';
-                        }
-                        else {
+                        } else {
                             $selected_option = '';
                         }
                         ?>
-                        <option value="<?php echo $custom_menu_record->id; ?>" <?php echo $selected_option; ?>><?php echo $custom_menu_record->menu_name; ?></option>
+                        <option value="<?php echo $menu->term_id; ?>" <?php echo $selected_option; ?>><?php echo $menu->name; ?></option>
                         <?php
 
@@ -1277 +1231 @@
 
             <p>
-
                 <label for="<?php echo $this->get_field_id('navtitle'); ?>"><?php _e('Title:'); ?></label>
                 <input type="text" name="<?php echo $this->get_field_name('navtitle'); ?>" value="<?php echo $navtitle; ?>" class="widefat" id="<?php echo $this->get_field_id('navtitle'); ?>" />
@@ -1317 +1270 @@
             <?php
 
-            if ($checked == 'yes')
-            {
+            if ( $checked == 'yes' ) {
 
                 ?>