From 730f87bf97bfc79ee5cfd3aae1b44f2f7dd53f63 Mon Sep 17 00:00:00 2001
From: ryan
Date: Wed, 24 Feb 2010 21:33:27 +0000
Subject: [PATCH] Formatting cleanups for the nav menu widget. see #11817
git-svn-id: http://svn.automattic.com/wordpress/trunk@13388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-includes/default-widgets.php | 361 +++++++++++++-------------------
1 file changed, 141 insertions(+), 220 deletions(-)
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index 96b06fb52..e220808a4 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -1066,11 +1066,8 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
} else {
$navwidgetdescription = $instance['navwidgetdescription'];
}
- $menuexists = false;
- global $wpdb;
-
- // GET menu name
+ // Get menu
if ( $navmenu > 0 ) {
$custom_menu = get_term( (int) $nav_menu, 'nav_menu' );
$wp_custom_nav_menu_name = $custom_menu->name;
@@ -1078,98 +1075,72 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
} else {
$menuexists = false;
}
- ?>
-
-
-
+
+
+
+
+ $navmenu, 'name' => $wp_custom_nav_menu_name, 'desc' => $navwidgetdescription, 'format' => 'widget') );
+ if ( $navdeveloper == 'yes' ) {
+ //DISPLAY Custom UL
+ if ( $navul == 'yes' ) {
+ ?>
+
+
+
+
-
+ } else {
+ // DISPLAY default DIV
+ ?>
+
+ false ) );
- if ( $custom_menus ) {
- ?>
-
-
-
-
-
-
-
-
+ if ( !$custom_menus) {
+ ?>
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- />
- />
+ />
+ />
+
-
-
-
-
-
-
-
-
-
- />
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ />
+ />
+
+
+
-
-
-
-
- />
- />
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- style="display:none;">
-
-
-
-
-
- />
- />
-
-
-
-
+
+
-
+
+
+
+
+ />
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style="display:none;">
+
+
+
+ />
+ />
+
+
+