Changeset 13268

Timestamp:

02/21/2010 12:03:42 AM (15 years ago)

Author:

ryan

Message:

Trim trailing whites

Location:

trunk

Files:

• wp-admin/comment.php (modified) (1 diff)
• wp-admin/css/custom-navigation.dev.css (modified) (1 diff)
• wp-admin/custom-navigation.php (modified) (33 diffs)
• wp-admin/edit-tags.php (modified) (2 diffs)
• wp-admin/js/custom-navigation-default-items.dev.js (modified) (10 diffs)
• wp-admin/js/custom-navigation-dynamic-functions.dev.js (modified) (15 diffs)
• wp-admin/js/custom-navigation-php-functions.dev.js (modified) (8 diffs)
• wp-admin/js/tags.dev.js (modified) (1 diff)
• wp-admin/plugins.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/comment-template.php (modified) (3 diffs)
• wp-includes/custom-navigation.php (modified) (61 diffs)
• wp-includes/default-widgets.php (modified) (10 diffs)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/http.php (modified) (1 diff)
• wp-includes/ms-default-constants.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)
• wp-includes/template-loader.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/comment.php

@@ -250 +250 @@
             $redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
             break;
-    }   
+    }
 
     wp_redirect( $redir );

trunk/wp-admin/css/custom-navigation.dev.css

@@ -9 +9 @@
  * @subpackage Administration
  */
- 
+
 .fix{clear: both;height: 1px;margin: -1px 0 0;overflow: hidden;}
 

trunk/wp-admin/custom-navigation.php

@@ -10 +10 @@
  * @subpackage Administration
  */
- 
+
 require_once('admin.php');
 
@@ -29 +29 @@
 function wp_custom_nav_reset() {
     wp_custom_navigation_setup(true);
-        
+
     return true;
-    
+
 }
 
@@ -47 +47 @@
     <div class="wrap">
     <div id="no-js"><h3>You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.</h3></div>
-            
+
     <?php
     $messagesdiv = '';
     $menu_id_in_edit = 0;
-        
+
     // Get the theme name
     $themename =  get_current_theme();
-        
+
     // Check which menu is selected and if menu is in edit already
     if ( isset( $_POST['switch_menu'] ) )
@@ -60 +60 @@
     elseif ( isset( $_POST['menu_id_in_edit'] ) )
         $menu_selected_id = $_POST['menu_id_in_edit'];
-        
+
     // Default Menu to show
     $custom_menus = get_terms( 'menu', array( 'hide_empty' => false ) );
@@ -75 +75 @@
         }
     }
-        
+
     if ( isset( $_POST['set_wp_menu'] ) ) {
             update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
         $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename.'s Custom Menu has been updated!</p></div>';
-    } 
-      
+    }
+
     if ( isset( $_POST['licount'] ) )
         $postCounter = $_POST['licount'];
@@ -94 +94 @@
             if ( $existing_term ) {
                 $messagesdiv = '<div id="message" class="error fade below-h2"><p>'.$insert_menu_name.' Menu has already created - please try another name</p></div>';
-            } else { 
+            } else {
                 $term = wp_insert_term( $insert_menu_name, 'menu' );
                 if ( $term ) {
@@ -100 +100 @@
                     $menu_selected_id = $term['term_id'];
                     $menu_id_in_edit = $menu_selected_id;
-                    $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$insert_menu_name.' Menu has been created!</p></div>'; 
+                    $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$insert_menu_name.' Menu has been created!</p></div>';
 
                     $postCounter = 0;
@@ -109 +109 @@
         }
     }
-        
-    if ( isset($_POST['reset_wp_menu']) ) { 
+
+    if ( isset($_POST['reset_wp_menu']) ) {
             $success = wp_custom_nav_reset();
             if ($success) {
@@ -129 +129 @@
         //Loop through all POST variables
         for ($k = 1;$k<= $postCounter; $k++) {
-            
+
             if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
             if (isset($_POST['postmenu'.$k])) { $post_id = $_POST['postmenu'.$k]; } else { $post_id = 0; }
@@ -143 +143 @@
             if (isset($_POST['anchortitle'.$k])) { $custom_anchor_title = stripslashes($_POST['anchortitle'.$k]); } else { $custom_anchor_title = $custom_title; }
             if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; }
-            
+
             $post = array( 'post_status' => 'publish', 'post_type' => 'menu_item', 'post_author' => $user_ID,
                 'ping_status' => 0, 'post_parent' => $post_id, '`menu_order' => $position,
@@ -176 +176 @@
         $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename.'s Custom Menu has been updated!</p></div>';
     }
-        
+
         //DISPLAY Custom Navigation
         ?>
@@ -183 +183 @@
             <h2 class="maintitle">Custom Navigation</h2>
             <?php
-                
+
                 //CHECK if custom menu has been enabled
                 $enabled_menu = get_option('wp_custom_nav_menu');
                 $checked = strtolower($enabled_menu);
-    
+
                 if ($checked == 'true') {
                 } else {
                     echo '<div id="message-enabled" class="error fade below-h2"><p><strong>The Custom Menu has not been Enabled yet. Please enable it in order to use it --------></strong></p></div>';
                 }
-                
-                
+
+
             ?>
             <?php echo $messagesdiv; ?>
             <form onsubmit="updatepostdata()" action="custom-navigation.php" method="post"  enctype="multipart/form-data">
-            
+
             <input type="hidden" name="licount" id="licount" value="0" />
             <input type="hidden" name="menu_id_in_edit" id="menu_id_in_edit" value="<?php echo $menu_selected_id; ?>" />
-            
+
             <div class="sidebar-name">
-            
+
                 <div class="sidebar-name-arrow">
                     <br/>
                 </div>
                 <h3><?php echo $menu_title; ?></h3>
-                
+
             </div>
-            
+
             <div id="nav-container">
                 <ul id="custom-nav">
-                
+
             <?php
             //DISPLAY existing menu
@@ -220 +220 @@
                 //MAIN OUTPUT FUNCTION
                 wp_custom_navigation_output( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
-            }               
+            }
             ?>
-                
+
                 </ul>
             </div><!-- /#nav-container -->
-            
+
             <p class="submit">
-            
+
             <script type="text/javascript">
-                updatepostdata();               
+                updatepostdata();
             </script>
-            
+
             <input id="save_bottom" name="save_bottom" type="submit" value="Save All Changes" /></p>
             </div><!-- /.inside -->
         </div>
-        
+
         <div id="menu-right">
-        
+
             <h2 class="heading">Options</h2>
-            
+
             <div class="widgets-holder-wrap">
                 <div class="sidebar-name">
@@ -246 +246 @@
                 </div>
                 <div class="widget-holder">
-                        
+
                     <?php
-                    
+
                     //SETUP Custom Menu
-                    
+
                     $enabled_menu = get_option('wp_custom_nav_menu');
-                       
+
                     $checked = strtolower($enabled_menu);
-        
+
                     ?>
-                    
+
                     <span >
                         <label>Enable</label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
                         <label>Disable</label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
-                    </span><!-- /.checkboxes -->                
-                        
+                    </span><!-- /.checkboxes -->
+
                     <input id="set_wp_menu" type="submit" value="Set Menu" name="set_wp_menu" class="button" /><br />
-                    
+
                     <span>
                         <label>Reset Menu to Default</label>
                         <input id="reset_wp_menu" type="submit" value="Reset" name="reset_wp_menu" class="button" onclick="return confirm('Are you sure you want to RESET the Custom Navigation Menu to its Default Settings?');" />
                     </span>
-                    
+
                     <div class="fix"></div>
                 </div>
             </div><!-- /.widgets-holder-wrap -->
-            
+
             <div class="widgets-holder-wrap">
                 <div class="sidebar-name">
@@ -280 +280 @@
                 <div class="widget-holder">
                     <select id="menu_select" name="menu_select">
-                        <?php 
-                        
+                        <?php
+
                         //DISPLAY SELECT OPTIONS
                         foreach( $custom_menus as $menu ) {
@@ -292 +292 @@
                             <option value="<?php echo $menu_term->term_id; ?>" <?php echo $selected_option; ?>><?php echo $menu_term->name; ?></option>
                             <?php
-                            
+
                         }
                         ?>
                     </select>
-                    
+
                     <input id="switch_menu" type="submit" value="Switch" name="switch_menu" class="button" />
                     <input id="add_menu_name" name="add_menu_name" type="text" value=""  />
                     <input id="add_menu" type="submit" value="Add Menu" name="add_menu" class="button" />
-                        
+
                     <div class="fix"></div>
                 </div>
@@ -310 +310 @@
                     <h3>Top Level Menu Descriptions</h3>
                 </div>
-                <div class="widget-holder"> 
+                <div class="widget-holder">
                     <span>Display Descriptions in Top Level Menu?</span>
-            
+
                     <?php
-                    
+
                     //UPDATE and DISPLAY Menu Description Option
                     if (isset($_POST['menu-descriptions']))
                     {
-                        
+
                         if (isset($_POST['switch_menu'])) {
-                            
+
                         }
                         else {
                             $menu_options_to_edit = $_POST['menu_id_in_edit'];
-                            update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']); 
+                            update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
                         }
-                        
+
                     }
-                    
+
                     if ($menu_id_in_edit > 0)
                     {
@@ -336 +336 @@
                         $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
                     }
-                
+
                     $checked = strtolower($checkedraw);
-                    
+
                     if ($advanced_option_descriptions == 'no')
                     {
                         $checked = 'no';
                     }
-                    
+
                     ?>
-                    
+
                     <span class="checkboxes">
                         <label>Yes</label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
@@ -354 +354 @@
                 </div>
             </div><!-- /.widgets-holder-wrap -->
-            
+
             <div class="widgets-holder-wrap">
                 <div class="sidebar-name">
@@ -361 +361 @@
                 </div>
                 <div class="widget-holder">
-                    
+
                     <?php
-                    
+
                     $pages_args = array(
                     'child_of' => 0,
@@ -378 +378 @@
                     'number' => '',
                     'offset' => 0 );
-    
-                    //GET all pages     
+
+                    //GET all pages
                     $pages_array = get_pages($pages_args);
                     $page_name = '';
@@ -387 +387 @@
                         foreach ($pages_array as $post)
                         {
-                            //Add page name to 
+                            //Add page name to
                             $page_name .= htmlentities($post->post_title).'|';
                         }
@@ -395 +395 @@
                         $page_name = "No pages available";
                     }
-                        
+
                     ?>
-                    
+
                     <script>
                         jQuery(document).ready(function(){
@@ -403 +403 @@
                             //GET PHP pages
                             var dataposts = "<?php echo $page_name; ?>".split("|");
-                        
+
                             //Set autocomplete
                             jQuery("#page-search").autocomplete(dataposts);
-                        
+
                             //Handle autocomplete result
                             jQuery("#page-search").result(function(event, data, formatted) {
                                 jQuery('#existing-pages').css('display','block');
                                 jQuery("#existing-pages dt:contains('" + data + "')").css("display", "block");
-                            
+
                                 jQuery('#show-pages').hide();
                                 jQuery('#hide-pages').show();
-                            
+
                             });
                             jQuery('#existing-pages').css('display','none');
@@ -421 +421 @@
 
 
-                    <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="Search Pages" /> 
-                    
-                    <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a> 
+                    <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="Search Pages" />
+
+                    <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a>
                     <a id="hide-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','none');jQuery('#page-search').attr('value','Search Pages');jQuery('#existing-pages dt').css('display','none');jQuery('#show-pages').show();jQuery('#hide-pages').hide();">Hide All</a>
-                    
+
                     <script type="text/javascript">
-                    
+
                         jQuery('#hide-pages').hide();
-                    
+
                     </script>
-                    
+
                     <ul id="existing-pages" class="list">
                         <?php
@@ -439 +439 @@
                         ?>
                     </ul>
-                    
+
                     <div class="fix"></div>
-                    
+
                 </div>
             </div><!-- /.widgets-holder-wrap -->
-            
+
             <div class="widgets-holder-wrap">
                 <div class="sidebar-name">
@@ -451 +451 @@
                 </div>
                 <div class="widget-holder">
-                    
+
                     <?php
-                    
+
                     //Custom GET categories query
                     $categories = $wpdb->get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC");
@@ -460 +460 @@
                     if ($categories)
                     {
-                        foreach($categories as $category) 
-                        { 
+                        foreach($categories as $category)
+                        {
                             $cat_id = $category->term_id;
-                
+
                             $cat_args=array(
                                 'orderby' => 'name',
@@ -470 +470 @@
                                 'order' => 'ASC'
                             );
-                            
+
                             $category_names=get_categories($cat_args);
-                            
+
                             if (isset($category_names[0]->name))
                             {
@@ -484 +484 @@
                         $cat_name = "No categories available";
                     }
-                  
+
                     ?>
 
@@ -492 +492 @@
                             //GET PHP categories
                             var datacats = "<?php echo $cat_name; ?>".split("|");
-                            
+
                             //Set autocomplete
                             jQuery("#cat-search").autocomplete(datacats);
-                        
+
                             //Handle autocomplete result
                             jQuery("#cat-search").result(function(event, data, formatted) {
                                 jQuery('#existing-categories').css('display','block');
                                 jQuery("#existing-categories dt:contains('" + data + "')").css("display", "block");
-                                                    
+
                                 jQuery('#show-cats').hide();
                                 jQuery('#hide-cats').show();
-                            
+
                             });
                             jQuery('#existing-categories').css('display','none');
-                    
+
                         });
                     </script>
 
 
-                    <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="Search Categories" /> 
-                    
-                    <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a> 
+                    <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="Search Categories" />
+
+                    <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
                     <a id="hide-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','none');jQuery('#cat-search').attr('value','Search Categories');jQuery('#existing-categories dt').css('display','none');jQuery('#show-cats').show();jQuery('#hide-cats').hide();">Hide All</a>
-                    
+
                     <script type="text/javascript">
-                    
+
                         jQuery('#hide-cats').hide();
-                    
+
                     </script>
-                    
+
                     <ul id="existing-categories" class="list">
                         <?php
                             //Get default Categories
-                            $intCounter = wp_custom_nav_get_categories($intCounter,'default');              
+                            $intCounter = wp_custom_nav_get_categories($intCounter,'default');
                         ?>
                     </ul>
-                    
+
                     <div class="fix"></div>
-                    
+
                 </div>
             </div><!-- /.widgets-holder-wrap -->
-            
+
             <div class="widgets-holder-wrap">
                 <div class="sidebar-name">
@@ -552 +552 @@
                 </div>
             </div><!-- /.widgets-holder-wrap -->
-            
+
        </div>
     </div>
-    
+
     <script type="text/javascript">
         document.getElementById('pages-left').style.display='block';
@@ -561 +561 @@
         document.getElementById('no-js').style.display='none';
     </script>
-    
+
     <div id="dialog-confirm" title="Edit Menu Item">
         </label><input id="edittitle" type="text" name="edittitle" value="" /><label class="editlabel" for="edittitle">Menu Title</label><br />

trunk/wp-admin/edit-tags.php

@@ -225 +225 @@
     $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
     $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
-} elseif ( 'category' == $taxonomy ) { 
+} elseif ( 'category' == $taxonomy ) {
     $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
 } else {
@@ -305 +305 @@
 
 <?php if ( 'category' == $taxonomy ) : ?>
-<div class="form-wrap"> 
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p> 
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p> 
-</div> 
+<div class="form-wrap">
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
+</div>
 <?php endif; ?>
 

trunk/wp-admin/js/custom-navigation-default-items.dev.js

@@ -9 +9 @@
  * @subpackage Administration
  */
- 
+
 /*
  * Init Functions
@@ -24 +24 @@
             buttons: {
                 'Save': function() {
-                    
+
                     titletosave = $('#edittitle').attr('value');
                     linktosave = $('#editlink').attr('value');
@@ -30 +30 @@
                     newwindowtosave = $('#editnewwindow').attr('value');
                     desctosave = $('#editdescription').attr('value');
-                    
+
                     $('#title' + $(this).dialog('option', 'itemID')).attr('value',titletosave);
                     $('#linkurl' + $(this).dialog('option', 'itemID')).attr('value',linktosave);
@@ -36 +36 @@
                     $('#newwindow' + $(this).dialog('option', 'itemID')).attr('value',newwindowtosave);
                     $('#description' + $(this).dialog('option', 'itemID')).attr('value',desctosave);
-                    
+
                     $('#menu-' + $(this).dialog('option', 'itemID') + ' > dl > dt > span.title').text(titletosave);
-                    
+
                     $('#view' + + $(this).dialog('option', 'itemID')).attr('href', linktosave);
-                    
+
                     $(this).dialog('close');
-                    
+
                 },
                 Cancel: function() {
@@ -49 +49 @@
             }
         });
-        
+
         $('#message').animate({ opacity: 1.0 },2000).fadeOut(300, function(){ $(this).remove();});
-        
+
         //Add dropzone
-        $('#custom-nav li').prepend('<div class="dropzone"></div>');    
-        
+        $('#custom-nav li').prepend('<div class="dropzone"></div>');
+
         //Make li items draggable
         $('#custom-nav li').draggable({
@@ -69 +69 @@
             accept: '#custom-nav li',
             tolerance: 'pointer',
-            drop: function(e, ui) 
+            drop: function(e, ui)
             {
                 var li = $(this).parent();
                 var child = !$(this).hasClass('dropzone');
                 //Add UL to first child
-                if (child && li.children('ul').length == 0) 
+                if (child && li.children('ul').length == 0)
                 {
                     li.append('<ul id="sub-menu" />');
                 }
                 //Make it draggable
-                if (child) 
+                if (child)
                 {
                     li.children('ul').append(ui.draggable);
                 }
-                else 
+                else
                 {
                     li.before(ui.draggable);
@@ -89 +89 @@
 
                 li.find('dl,.dropzone').css({ backgroundColor: '', borderColor: '' });
-                
+
                 var draggablevalue = ui.draggable.attr('value');
                 var droppablevalue = li.attr('value');
-                li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue); 
+                li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
                 $(this).parent().find("dt").removeAttr('style');
                 $(this).parent().find("div:first").removeAttr('style');
-                
-                
+
+
             },
-            over: function() 
+            over: function()
             {
                 //Add child
-                if ($(this).attr('class') == 'dropzone ui-droppable') 
+                if ($(this).attr('class') == 'dropzone ui-droppable')
                 {
                     $(this).parent().find("div:first").css('background', 'none').css('height', '50px');
                 }
                 //Add above
-                else if ($(this).attr('class') == 'ui-droppable') 
+                else if ($(this).attr('class') == 'ui-droppable')
                 {
                     $(this).parent().find("dt:first").css('background', '#d8d8d8');
@@ -112 +112 @@
                 //do nothing
                 else {
-                
+
                 }
                 var parentid = $(this).parent().attr('id');
-                
+
             },
-            out: function() 
+            out: function()
             {
                 $(this).parent().find("dt").removeAttr('style');
@@ -124 +124 @@
             },
             deactivate: function()
-            {   
-                
-                    
+            {
+
+
             }
-            
-                
+
+
         });
-                 
-        //Handle Save Button Clicks 
+
+        //Handle Save Button Clicks
         $('#save_top').click(function()
         {
@@ -141 +141 @@
             updatepostdata();
         });
-        
+
 
     });

trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js

@@ -9 +9 @@
  * @subpackage Administration
  */
- 
+
 /*
  * Removes menu items from current menu
  * @param int o - the id of the menu li to remove.
 */
-function removeitem(o) 
-{
-            
+function removeitem(o)
+{
+
     var todelete = document.getElementById('menu-' + o);
-    
+
     if (todelete)
-    {       
+    {
         var parenttodelete = document.getElementById('menu-' + o).parentNode;
-        throwaway_node = parenttodelete.removeChild(todelete); 
-    }   
-            
+        throwaway_node = parenttodelete.removeChild(todelete);
+    }
+
     updatepostdata();
 };
@@ -32 +32 @@
  * @param int o - the id of the menu li to edit.
 */
-function edititem(o) 
-{
-            
+function edititem(o)
+{
+
         itemTitle = jQuery('#title' + o).attr('value');
         itemURL = jQuery('#linkurl' + o).attr('value');
@@ -40 +40 @@
         itemNewWindow = jQuery('#newwindow' + o).attr('value');
         itemDesc = jQuery('#description' + o).attr('value');
-        
+
         jQuery('#dialog-confirm').dialog( 'option' , 'itemID' , o )
-                
+
         jQuery('#dialog-confirm').dialog('open');
-        
+
         jQuery('#edittitle').attr('value', itemTitle);
         jQuery('#editlink').attr('value', itemURL);
@@ -50 +50 @@
         jQuery("#editnewwindow option[value='" + itemNewWindow  + "']").attr('selected', 'selected');
         jQuery('#editdescription').attr('value', itemDesc);
-    
+
 };
 
@@ -56 +56 @@
  * Prepares menu items for POST
 */
-function updatepostdata() 
-{           
-    
+function updatepostdata()
+{
+
     var i = 0;
      jQuery("#custom-nav").find("li").each(function(i) {
         i = i + 1;
         var j = jQuery(this).attr('value');
-        
+
         jQuery(this).find('#position' + j).attr('value', i);
         jQuery(this).attr('id','menu-' + i);
         jQuery(this).attr('value', i);
-        
+
         jQuery(this).find('#dbid' + j).attr('name','dbid' + i);
         jQuery(this).find('#dbid' + j).attr('id','dbid' + i);
-        
+
         jQuery(this).find('#postmenu' + j).attr('name','postmenu' + i);
         jQuery(this).find('#postmenu' + j).attr('id','postmenu' + i);
-        
+
         var p = jQuery(this).find('#parent' + j).parent().parent().parent().attr('value');
-        
+
         jQuery(this).find('#parent' + j).attr('name','parent' + i);
         jQuery(this).find('#parent' + j).attr('id','parent' + i);
@@ -85 +85 @@
             p = 0;
         }
-                
+
         jQuery(this).find('#parent' + j).attr('value', p);
-                
+
         jQuery(this).find('#title' + j).attr('name','title' + i);
         jQuery(this).find('#title' + j).attr('id','title' + i);
-        
+
         jQuery(this).find('#linkurl' + j).attr('name','linkurl' + i);
         jQuery(this).find('#linkurl' + j).attr('id','linkurl' + i);
-            
+
         jQuery(this).find('#description' + j).attr('name','description' + i);
         jQuery(this).find('#description' + j).attr('id','description' + i);
-        
+
         jQuery(this).find('#icon' + j).attr('name','icon' + i);
         jQuery(this).find('#icon' + j).attr('id','icon' + i);
-        
+
         jQuery(this).find('#position' + j).attr('name','position' + i);
         jQuery(this).find('#position' + j).attr('id','position' + i);
-        
+
         jQuery(this).find('#linktype' + j).attr('name','linktype' + i);
         jQuery(this).find('#linktype' + j).attr('id','linktype' + i);
-        
+
         jQuery(this).find('#anchortitle' + j).attr('name','anchortitle' + i);
         jQuery(this).find('#anchortitle' + j).attr('id','anchortitle' + i);
-        
+
         jQuery(this).find('#newwindow' + j).attr('name','newwindow' + i);
         jQuery(this).find('#newwindow' + j).attr('id','newwindow' + i);
-        
+
         jQuery(this).find('dl > dt > span > #remove' + j).attr('value', i);
         jQuery(this).find('dl > dt > span > #remove' + j).attr('onClick', 'removeitem(' + i + ')');
@@ -119 +119 @@
 
    });
-   
-   
-    
-};  
+
+
+
+};
 
 /*
@@ -133 +133 @@
  * @param int itemparentid - default 0.
  * @param string itemdescription - the description of the menu item.
-*/  
-function appendToList(templatedir,additemtype,itemtext,itemurl,itemid,itemparentid,itemdescription) 
+*/
+function appendToList(templatedir,additemtype,itemtext,itemurl,itemid,itemparentid,itemdescription)
 {
     var inputvaluevarname = '';
@@ -143 +143 @@
     var inputicon = '';
 
-    if (additemtype == 'Custom') 
+    if (additemtype == 'Custom')
     {
         inputvaluevarname = document.getElementById('custom_menu_item_name').value;
@@ -160 +160 @@
         inputlinktype = 'page';
         inputdescription = htmlentities(itemdescription.toString());
-        
+
     }
     else if (additemtype == 'Category')
@@ -171 +171 @@
         inputdescription = htmlentities(itemdescription.toString());
     }
-    else 
+    else
     {
         inputvaluevarname = '';
@@ -180 +180 @@
         inputdescription = '';
     }
-    
+
     var count=document.getElementById('custom-nav').getElementsByTagName('li').length;
 
@@ -187 +187 @@
     var validatetest = 0;
 
-    try 
+    try
     {
         var test=document.getElementById("menu-" + randomnumber.toString()).value;
     }
-    catch (err) 
+    catch (err)
     {
         validatetest = 1;
     }
 
-    while (validatetest == 0) 
+    while (validatetest == 0)
     {
         randomnumber = randomnumber + 1;
 
-        try 
+        try
         {
             var test2=document.getElementById("menu-" + randomnumber.toString()).value;
         }
-        catch (err) 
+        catch (err)
         {
             validatetest = 1;
         }
     }
-    
+
     //Notification Message
     jQuery('.maintitle').after('<div id="message" class="updated fade below-h2"><p>Menu Item added!</p></div>');
     jQuery('#message').animate({ opacity: 1.0 },2000).fadeOut(300, function(){ jQuery(this).remove();});
-    
+
     //Appends HTML to the menu
     jQuery('#custom-nav').append('<li id="menu-' + randomnumber + '" value="' + randomnumber + '"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="title">' + inputvaluevarname + '</span><span class="controls"><span class="type">' + additemtype + '</span><a id="edit' + randomnumber + '" onclick="edititem(' + randomnumber + ')" value="' + randomnumber +'"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="' + templatedir + '/wp-admin/images/ico-edit.png" /></a> <a id="remove' + randomnumber + '" onclick="removeitem(' + randomnumber + ')" value="' + randomnumber +'"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="' + templatedir + '/wp-admin/images/ico-close.png" /></a> <a href="' + inputvaluevarurl + '" target="_blank"><img alt="View Custom Link" title="View Custom Link" src="' + templatedir + '/wp-admin/images/ico-viewpage.png" /></a></span></dt></dl><a class="hide" href="' + inputvaluevarurl + '">' + inputvaluevarname + '</a><input type="hidden" name="postmenu' + randomnumber + '" id="postmenu' + randomnumber + '" value="' + inputitemid + '" /><input type="hidden" name="parent' + randomnumber + '" id="parent' + randomnumber + '" value="' + inputparentid + '" /><input type="hidden" name="title' + randomnumber + '" id="title' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="linkurl' + randomnumber + '" id="linkurl' + randomnumber + '" value="' + inputvaluevarurl + '" /><input type="hidden" name="description' + randomnumber + '" id="description' + randomnumber + '" value="' + inputdescription + '" /><input type="hidden" name="icon' + randomnumber + '" id="icon' + randomnumber + '" value="' + inputicon + '" /><input type="hidden" name="position' + randomnumber + '" id="position' + randomnumber + '" value="' + randomnumber + '" /><input type="hidden" name="linktype' + randomnumber + '" id="linktype' + randomnumber + '" value="' + inputlinktype + '" /><input type="hidden" name="anchortitle' + randomnumber + '" id="anchortitle' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="newwindow' + randomnumber + '" id="newwindow' + randomnumber + '" value="0" /></li>');
@@ -231 +231 @@
         accept: '#' + randomnumber + ', #custom-nav li',
         tolerance: 'pointer',
-        drop: function(e, ui) 
+        drop: function(e, ui)
         {
             var li = jQuery(this).parent();
             var child = !jQuery(this).hasClass('dropzone');
             //Append UL to first child
-            if (child && li.children('ul').length == 0) 
+            if (child && li.children('ul').length == 0)
             {
                 li.append('<ul/>');
             }
             //Make it draggable
-            if (child) 
+            if (child)
             {
                 li.children('ul').append(ui.draggable);
             }
-            else 
+            else
             {
                 li.before(ui.draggable);
             }
-            
-            li.find('dl,.dropzone').css({ backgroundColor: '', borderColor: '' });  
-            
+
+            li.find('dl,.dropzone').css({ backgroundColor: '', borderColor: '' });
+
             var draggablevalue = ui.draggable.attr('value');
             var droppablevalue = li.attr('value');
-            li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue); 
+            li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
             jQuery(this).parent().find("dt").removeAttr('style');
             jQuery(this).parent().find("div:first").removeAttr('style');
-            
+
         },
-        over: function() 
+        over: function()
             {
                 //Add child
-                if (jQuery(this).attr('class') == 'dropzone ui-droppable') 
+                if (jQuery(this).attr('class') == 'dropzone ui-droppable')
                 {
                     jQuery(this).parent().find("div:first").css('background', 'none').css('height', '50px');
                 }
                 //Add above
-                else if (jQuery(this).attr('class') == 'ui-droppable') 
+                else if (jQuery(this).attr('class') == 'ui-droppable')
                 {
                     jQuery(this).parent().find("dt:first").css('background', '#d8d8d8');
@@ -273 +273 @@
                 //do nothing
                 else {
-                
+
                 }
                 var parentid = jQuery(this).parent().attr('id');
-                
+
             },
-            out: function() 
+            out: function()
             {
                 jQuery(this).parent().find("dt").removeAttr('style');

trunk/wp-admin/js/custom-navigation-php-functions.dev.js

@@ -1 @@
-/* 
+/*
  * More info at: http://phpjs.org
- * 
+ *
  * This is version: 3.08
  * php.js is copyright 2010 Kevin van Zonneveld.
- * 
+ *
  * Portions copyright Brett Zamir (http://brett-zamir.me), Kevin van Zonneveld
  * (http://kevin.vanzonneveld.net), Onno Marsman, Theriault, Michael White
@@ -85 +85 @@
  * Rosa, Tod Gentille, Riddler (http://www.frontierwebdev.com/), Alexander M
  * Beedie
- * 
+ *
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -96 +96 @@
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -107 +107 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
- */ 
+ */
 
 function get_html_translation_table (table, quote_style) {
@@ -129 +129 @@
     // *     example 1: get_html_translation_table('HTML_SPECIALCHARS');
     // *     returns 1: {'"': '&quot;', '&': '&amp;', '<': '&lt;', '>': '&gt;'}
-    
+
     var entities = {}, hash_map = {}, decimal = 0, symbol = '';
     var constMappingTable = {}, constMappingQuoteStyle = {};
     var useTable = {}, useQuoteStyle = {};
-    
+
     // Translate arguments
     constMappingTable[0]      = 'HTML_SPECIALCHARS';
@@ -264 +264 @@
         hash_map[symbol] = entities[decimal];
     }
-    
+
     return hash_map;
 }
@@ -287 +287 @@
     var hash_map = {}, symbol = '', tmp_str = '', entity = '';
     tmp_str = string.toString();
-    
+
     if (false === (hash_map = this.get_html_translation_table('HTML_ENTITIES', quote_style))) {
         return false;
@@ -296 +296 @@
         tmp_str = tmp_str.split(symbol).join(entity);
     }
-    
+
     return tmp_str;
 }

trunk/wp-admin/js/tags.dev.js

@@ -39 +39 @@
                 return;
 
-            var parent = form.find('select#parent').val();  
+            var parent = form.find('select#parent').val();
 
             if ( parent > 0 && $('#tag-' + parent ).length > 0 ) // If the parent exists on this page, insert it below. Else insert it at the top of the list.

trunk/wp-admin/plugins.php

@@ -546 +546 @@
                 if ( is_multisite() && is_super_admin() )
                     $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
-    
+
                 if ( !is_multisite() && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
                     $actions[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
-    
+
                 if ( ! $is_active && current_user_can('delete_plugins') )
                     $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';

trunk/wp-includes/canonical.php

@@ -145 +145 @@
                 if ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
                     $tax = get_taxonomy( $obj->taxonomy );
-                    if ( false !== $tax->query_var) 
+                    if ( false !== $tax->query_var)
                         $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
                 }

trunk/wp-includes/category-template.php

@@ -365 +365 @@
     else
         $output = '';
-    
+
     if ( empty($categories) && ! $r['hide_if_empty'] && !empty($show_option_none) ) {
         $show_option_none = apply_filters( 'list_cats', $show_option_none );
         $output .= "\t<option value='-1' selected='selected'>$show_option_none</option>\n";
     }
-    
+
     if ( ! empty( $categories ) ) {
 

trunk/wp-includes/comment-template.php

@@ -1470 +1470 @@
                                                                                                     '<label for="author">' . __( 'Name' ) . '</label> ' .
                                                                                                     ( $req ? '<span class="required">*</span>' : '' ) .
-                                                                                                    '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' />' . 
+                                                                                                    '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' />' .
                                                                                                     '</p><!-- #form-section-author .form-section -->',
                                                                                             'email' => '<p class="comment-form-email">' .
@@ -1476 +1476 @@
                                                                                                         ( $req ? '<span class="required">*</span>' : '' ) .
                                                                                                         '<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' />' .
-                                                                                                        '</p><!-- #form-section-email .form-section -->', 
+                                                                                                        '</p><!-- #form-section-email .form-section -->',
                                                                                             'url' => '<p class="comment-form-url">' .
                                                                                                         '<label for="url">' . __( 'Website' ) . '</label>' .
@@ -1487 +1487 @@
                         'must_log_in' => '<p class="must-log-in">' .  sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
                         'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out?</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
-                        'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>', 
+                        'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>',
                         'comment_notes_after' => '<dl class="form-allowed-tags"><dt>' . __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:' ) . '</dt> <dd><code>' . allowed_tags() . '</code></dd></dl>',
                         'id_form' => 'commentform',

trunk/wp-includes/custom-navigation.php

@@ -32 +32 @@
 
 function wp_custom_navigation_setup($override = false) {
-    
+
     $nav_version = '1.1.0';
     //Custom Navigation Menu Setup
-    
+
     //Check for Upgrades
     if (get_option('wp_settings_custom_nav_version') <> '') {
@@ -43 +43 @@
         $nav_version_in_db = '0';
     }
-    
+
     //Override for menu descriptions
     update_option('wp_settings_custom_nav_advanced_options','yes');
-            
-    if(($nav_version_in_db <> $nav_version) || ($override)) 
+
+    if(($nav_version_in_db <> $nav_version) || ($override))
         update_option('wp_settings_custom_nav_version',$nav_version);
 
@@ -85 +85 @@
 
 function wp_custom_navigation_output($args = array()) {
-        
+
         //DEFAULT ARGS
         $type = 'frontend';
-        $name = 'Menu 1'; 
+        $name = 'Menu 1';
         $id = 0;
         $desc = 2;
         $before_title = '';
         $after_title = '';
-        
+
         if (isset($args)) {
-        
-            if ( !is_array($args) ) 
+
+            if ( !is_array($args) )
             parse_str( $args, $args );
-    
+
             extract($args);
         }
@@ -110 +110 @@
             $desc = 2;
         }
-        
+
         $queried_id = 0;
         global $wp_query;
@@ -146 +146 @@
                     else
                         $link = $menu_item->guid;
-                
+
                     if ( $menu_item->post_title == '' ) {
                         $title_raw = get_categories( 'include='.$menu_item->post_parent );
-                        $title =  htmlentities($title_raw[0]->cat_name);    
+                        $title =  htmlentities($title_raw[0]->cat_name);
                     } else {
                         $title = htmlentities( $menu_item->post_title );
                     }
-                
+
                     if ( $menu_item->post_content == '' )
                         $description = htmlentities( strip_tags( category_description( $menu_item->post_parent ) ) );
@@ -177 +177 @@
                 $anchor_title = $title;
             }
-            
+
             if ($queried_id == $wp_custom_nav_menu_items->post_id) {
                 $li_class = 'class="current_page_item"';
@@ -184 +184 @@
                 $li_class = '';
             }
-            
+
             if (isset($wp_custom_nav_menu_items->new_window)) {
                 if ($wp_custom_nav_menu_items->new_window > 0) {
@@ -193 +193 @@
                 }
             }
-*/          
+*/
             //List Items
             ?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $li_class; ?>><?php
@@ -199 +199 @@
                     //FRONTEND Link
                     if ($type == "frontend")
-                    {           
-                        ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $before_title.$title.$after_title; ?><?php 
-                        
-                            if ( $advanced_option_descriptions == 'no' ) 
-                            { 
+                    {
+                        ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $before_title.$title.$after_title; ?><?php
+
+                            if ( $advanced_option_descriptions == 'no' )
+                            {
                                 // 2 widget override do NOT display descriptions
                                 // 1 widget override display descriptions
@@ -210 +210 @@
                                 {
                                     ?><span class="nav-description"><?php echo $description; ?></span><?php
-                                } 
+                                }
                                 elseif ($desc == 2)
                                 { }
                                 else
                                 { }
-                            } 
-                            else 
+                            }
+                            else
                             {
                                 // 2 widget override do NOT display descriptions
@@ -224 +224 @@
                                 {
                                     ?><span class="nav-description"><?php echo $description; ?></span><?php
-                                } 
+                                }
                                 elseif (($desc == 2) || ($desc == 0))
                                 { }
-                                else 
+                                else
                                 { }
                             }
-                            
-                        ?></a><?php 
+
+                        ?></a><?php
                     }
                     //BACKEND draggable and droppable elements
@@ -238 +238 @@
                     {
                         ?>
-                        
+
                         <dl>
                             <dt>
@@ -250 +250 @@
                             </dt>
                         </dl>
-                        
+
                         <a><span class=""></span></a>
                         <input type="hidden" name="dbid<?php echo $menu_item->menu_order; ?>" id="dbid<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
@@ -263 +263 @@
                         <input type="hidden" name="anchortitle<?php echo $menu_item->menu_order; ?>" id="anchortitle<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_html( $menu_item->post_excerpt ); ?>" />
                         <input type="hidden" name="newwindow<?php echo $menu_item->menu_order; ?>" id="newwindow<?php echo $menu_item->menu_order; ?>" value="<?php echo ( '' == $menu_item->post_content_filtered ? '0' : '1' ); ?>" />
-                        
-                        <?php 
+
+                        <?php
                     }
 
                     //@todo: implement menu heirarchy
 /*                  //DISPLAY menu sub items
-                    if ($wp_custom_nav_menu_items->parent_id == 0) 
+                    if ($wp_custom_nav_menu_items->parent_id == 0)
                     {
                         //FRONTEND
-                        if ($type == 'frontend') 
+                        if ($type == 'frontend')
                         {
                             //Recursive function
@@ -278 +278 @@
                         }
                         //BACKEND
-                        else 
+                        else
                         {
                             //Recursive function
@@ -285 +285 @@
                     }
 */          ?></li>
-            <?php 
+            <?php
         }
 }
@@ -291 +291 @@
 //RECURSIVE Sub Menu Items
 function wp_custom_navigation_sub_items($post_id,$type,$table_name,$output_type,$menu_id = 0) {
-    
+
     $parent_id = 0;
     global $wpdb;
-    
+
     //GET sub menu items
     $wp_custom_nav_menu = $wpdb->get_results("SELECT id,post_id,parent_id,position,custom_title,custom_link,custom_description,menu_icon,link_type,custom_anchor_title,new_window FROM ".$table_name." WHERE parent_id = '".$post_id."' AND menu_id='".$menu_id."' ORDER BY position ASC");
-    
+
     if (empty($wp_custom_nav_menu))
     {
-    
+
     }
     else
@@ -318 +318 @@
         }
         //DISPLAY Loop
-        foreach ($wp_custom_nav_menu as $sub_item) 
+        foreach ($wp_custom_nav_menu as $sub_item)
         {
             //Figure out where the menu item sits
             $counter=$sub_item->position;
-            
+
             //Prepare Menu Data
             //Category Menu Item
-            if ($sub_item->link_type == 'category') 
-            {
-                
+            if ($sub_item->link_type == 'category')
+            {
+
                 $parent_id = $sub_item->parent_id;
                 $post_id = $sub_item->post_id;
-                
+
                 if ($sub_item->custom_link == '') {
                     $link = get_category_link($sub_item->post_id);
@@ -337 +337 @@
                     $link = $sub_item->custom_link;
                 }
-                
+
                 if ($sub_item->custom_title == '') {
                     $title_raw = get_categories('include='.$sub_item->post_id);
@@ -345 +345 @@
                     $title = htmlentities($sub_item->custom_title);
                 }
-                
+
                 if ($sub_item->custom_description == '') {
                     $description = strip_tags(category_description($sub_item->post_id));
@@ -357 +357 @@
             elseif ($sub_item->link_type == 'page')
             {
-                
+
                 $parent_id = $sub_item->parent_id;
                 $post_id = $sub_item->post_id;
-                
+
                 if ($sub_item->custom_link == '') {
                     $link = get_permalink($sub_item->post_id);
@@ -374 +374 @@
                     $title = htmlentities($sub_item->custom_title);
                 }
-                
+
                 if ($sub_item->custom_description == '') {
                     $description = get_post_meta($sub_item->post_id, 'page-description', true);
@@ -382 +382 @@
                 }
                 $target = '';
-                
+
             }
             //Custom Menu Item
@@ -400 +400 @@
                 $li_class = '';
             }
-            
+
             //SET anchor title
             if (isset($sub_item->custom_anchor_title)) {
@@ -408 +408 @@
                 $anchor_title = $title;
             }
-            
+
             if (isset($sub_item->new_window)) {
                 if ($sub_item->new_window > 0) {
@@ -414 +414 @@
                 }
             }
-            
+
             //List Items
-            ?><li id="menu-<?php echo $counter; ?>" value="<?php echo $counter; ?>" <?php echo $li_class; ?>><?php 
+            ?><li id="menu-<?php echo $counter; ?>" value="<?php echo $counter; ?>" <?php echo $li_class; ?>><?php
                         //FRONTEND
                         if ($output_type == "frontend")
                         {
-                            ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $title; ?></a><?php 
+                            ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $title; ?></a><?php
                         }
                         //BACKEND
@@ -431 +431 @@
                                 <span class="controls">
                                 <span class="type"><?php echo $sub_item->link_type; ?></span>
-                                <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a> 
+                                <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
                                 <a id="remove<?php echo $counter; ?>" onclick="removeitem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" /></a>
                                 <a id="view<?php echo $counter; ?>" target="_blank" href="<?php echo $link; ?>"><img alt="View Page" title="View Page" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-viewpage.png" /></a>
@@ -449 +449 @@
                             <input type="hidden" name="anchortitle<?php echo $counter; ?>" id="anchortitle<?php echo $counter; ?>" value="<?php echo $anchor_title; ?>" />
                             <input type="hidden" name="newwindow<?php echo $counter; ?>" id="newwindow<?php echo $counter; ?>" value="<?php echo $sub_item->new_window; ?>" />
-                            <?php 
+                            <?php
                         }
-                        
+
                         //Do recursion
-                        wp_custom_navigation_sub_items($sub_item->id,$sub_item->link_type,$table_name,$output_type,$menu_id); 
+                        wp_custom_navigation_sub_items($sub_item->id,$sub_item->link_type,$table_name,$output_type,$menu_id);
             ?></li>
-            <?php 
-    
-        } 
-    
+            <?php
+
+        }
+
     ?></ul>
-    <?php 
-    
-    } 
-    
+    <?php
+
+    }
+
     return $parent_id;
- 
+
 }
 
@@ -486 +486 @@
             'number' => '',
             'offset' => 0 );
-    
-    //GET all pages     
+
+    //GET all pages
     $pages_array = get_pages($pages_args);
-    
+
     $intCounter = $counter;
     $parentli = $intCounter;
-    
+
     if ($pages_array)
     {
@@ -498 +498 @@
         foreach ($pages_array as $post)
         {
-    
+
             if ($post->post_parent == 0)
             {
@@ -506 +506 @@
                     $description = get_post_meta($post->ID, 'page-description', true);
                     ?>
-                    
+
                     <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
-                
+
                         <dl>
                         <dt>
@@ -514 +514 @@
                         <span class="controls">
                             <span class="type">page</span>
-                            <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a> 
+                            <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
                             <a id="remove<?php echo $intCounter; ?>" onclick="removeitem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>">
                                 <img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" />
@@ -522 +522 @@
                             </a>
                         </span>
-                        
+
                         </dt>
                         </dl>
@@ -537 +537 @@
                         <input type="hidden" name="anchortitle<?php echo $intCounter; ?>" id="anchortitle<?php echo $intCounter; ?>" value="<?php echo htmlentities($post->post_title); ?>" />
                         <input type="hidden" name="newwindow<?php echo $intCounter; ?>" id="newwindow<?php echo $intCounter; ?>" value="0" />
-                        
+
                         <?php $parentli = $post->ID; ?>
-                        <?php $intCounter++; ?>                         
+                        <?php $intCounter++; ?>
                         <?php
-                        
+
                             //Recursive function
                             $intCounter = wp_custom_navigation_default_sub_items($post->ID, $intCounter, $parentli, 'pages', 'menu');
-                        
+
                         ?>
-                    
+
                     </li>
-                    
-                    <?php 
-                    
+
+                    <?php
+
                 }
                 //Sidebar Menu
@@ -556 +556 @@
                 {
                     ?>
-                     
+
                      <li>
                         <dl>
@@ -565 +565 @@
                             $post_id = $post->ID;
                             $post_parent_id = $post->post_parent;
-                            
+
                             $description = htmlentities(get_post_meta($post_id, 'page-description', true));
-                            
+
                         ?>
                         <?php $templatedir = get_bloginfo('url'); ?>
-                        
+
                         <span class="title"><?php echo $post->post_title; ?></span> <a onclick="appendToList('<?php echo $templatedir; ?>','Page','<?php echo $post_text; ?>','<?php echo $post_url; ?>','<?php echo $post_id; ?>','<?php echo $post_parent_id ?>','<?php echo $description; ?>')" name="<?php echo $post_text; ?>" value="<?php echo get_permalink($post->ID); ?>"><img alt="Add to Custom Menu" title="Add to Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-add.png" /></a></dt>
                         </dl>
                         <?php $parentli = $post->ID; ?>
-                        <?php $intCounter++; ?>             
+                        <?php $intCounter++; ?>
                         <?php
-                        
+
                             //Recursive function
                             $intCounter = wp_custom_navigation_default_sub_items($post_id, $intCounter, $parentli, 'pages', 'default');
-                        
+
                          ?>
-                            
+
                     </li>
-    
-                    <?php 
-                
+
+                    <?php
+
                 }
                 else
                 {
-                
-                }   
-            } 
-        } 
-    }
-    else 
+
+                }
+            }
+        }
+    }
+    else
     {
         echo 'Not Found';
@@ -617 +617 @@
             'number'                   => '',
             'pad_counts'               => false );
-    
-    
-    
-    $intCounter = $counter; 
-    
-    //GET all categories    
+
+
+
+    $intCounter = $counter;
+
+    //GET all categories
     $categories_array = get_categories($category_args);
-    
+
     if ($categories_array)
     {
@@ -637 +637 @@
                 {
                     ?>
-        
+
                     <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
                         <dl>
@@ -644 +644 @@
                             <span class="controls">
                             <span class="type">category</span>
-                            <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a> 
+                            <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
                             <a id="remove<?php echo $intCounter; ?>" onclick="removeitem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>">
                                 <img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" />
@@ -652 +652 @@
                             </a>
                             </span>
-                    
+
                         </dt>
                         </dl>
                         <a class="hide" href="<?php echo get_category_link($cat_item->cat_ID); ?>"><span class="title"><?php echo $cat_item->cat_name; ?></span>
-                        <?php 
+                        <?php
                         $use_cats_raw = get_option('wp_settings_custom_nav_descriptions');
                         $use_cats = strtolower($use_cats_raw);
@@ -673 +673 @@
                         <input type="hidden" name="anchortitle<?php echo $intCounter; ?>" id="anchortitle<?php echo $intCounter; ?>" value="<?php echo htmlentities($cat_item->cat_name); ?>" />
                         <input type="hidden" name="newwindow<?php echo $intCounter; ?>" id="newwindow<?php echo $intCounter; ?>" value="0" />
-                        
+
                         <?php $parentli = $cat_item->cat_ID; ?>
-                        <?php $intCounter++; ?>                         
+                        <?php $intCounter++; ?>
                         <?php
-                        
+
                             //Recursive function
                             $intCounter = wp_custom_navigation_default_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories','menu');
-                            
+
                         ?>
-                        
+
                     </li>
-                    
-                    <?php 
+
+                    <?php
                 }
                 //Sidebar Menu
@@ -705 +705 @@
                         </dl>
                         <?php $parentli = $cat_item->cat_ID; ?>
-                        <?php $intCounter++; ?>     
-                        <?php 
+                        <?php $intCounter++; ?>
+                        <?php
                             //Recursive function
                             $intCounter = wp_custom_navigation_default_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories','default');
                         ?>
-                        
+
                     </li>
-                    
-                    <?php 
-                }   
-            } 
+
+                    <?php
+                }
+            }
         }
     }
-    else 
+    else
     {
         echo 'Not Found';
     }
-    
+
     return $intCounter;
 }
@@ -730 +730 @@
 
     $counter = $intCounter;
-    
+
     //Custom Menu
-    if ($output_type == 'menu') 
+    if ($output_type == 'menu')
     {
         $sub_args = array(
@@ -740 +740 @@
     }
     //Sidebar Menu
-    elseif ($output_type == 'default') 
+    elseif ($output_type == 'default')
     {
         $sub_args = array(
@@ -747 +747 @@
         'parent' => $childof);
     }
-    else 
-    {
-        
-    }
-    
-    //Get Sub Category Items            
+    else
+    {
+
+    }
+
+    //Get Sub Category Items
     if ($type == 'categories')
     {
-        $sub_array = get_categories($sub_args); 
+        $sub_array = get_categories($sub_args);
     }
     //Get Sub Page Items
@@ -762 +762 @@
         $sub_array = get_pages($sub_args);
     }
-    
-    
+
+
     if ($sub_array)
     {
         ?>
-        
+
         <ul id="sub-custom-nav-<?php echo $type ?>">
-        
+
         <?php
         //DISPLAY Loop
@@ -776 +776 @@
             //Prepare Menu Data
             //Category Menu Item
-            if ($type == 'categories') 
+            if ($type == 'categories')
             {
                 $link = get_category_link($sub_item->cat_ID);
@@ -784 +784 @@
                 $linktype = 'category';
                 $appendtype = 'Category';
-                $description = htmlentities(strip_tags($sub_item->description));                
+                $description = htmlentities(strip_tags($sub_item->description));
             }
             //Page Menu Item
@@ -798 +798 @@
             }
             //Custom Menu Item
-            else 
+            else
             {
                 $title = '';
@@ -804 +804 @@
                 $appendtype= 'Custom';
             }
-            
+
             //Custom Menu
             if ($output_type == 'menu')
@@ -815 +815 @@
                             <span class="controls">
                             <span class="type"><?php echo $linktype; ?></span>
-                            <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a> 
+                            <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
                                 <a id="remove<?php echo $counter; ?>" onclick="removeitem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>">
                                     <img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" />
@@ -823 +823 @@
                                 </a>
                         </span>
-            
+
                     </dt>
                     </dl>
@@ -838 +838 @@
                     <input type="hidden" name="anchortitle<?php echo $counter; ?>" id="anchortitle<?php echo $counter; ?>" value="<?php echo $title; ?>" />
                     <input type="hidden" name="newwindow<?php echo $counter; ?>" id="newwindow<?php echo $counter; ?>" value="0" />
-                    
+
                     <?php $counter++; ?>
-                    <?php 
-                        
+                    <?php
+
                         //Do recursion
-                        $counter = wp_custom_navigation_default_sub_items($parent_id, $counter, $parent_id, $type, 'menu'); 
-                        
+                        $counter = wp_custom_navigation_default_sub_items($parent_id, $counter, $parent_id, $type, 'menu');
+
                     ?>
-                    
+
                 </li>
-                <?php 
+                <?php
             }
             //Sidebar Menu
             elseif ($output_type == 'default')
             {
-                    
+
                 ?>
                 <li>
                     <dl>
                     <dt>
-                    
+
                     <?php $templatedir = get_bloginfo('url'); ?>
                     <span class="title"><?php echo $title; ?></span> <a onclick="appendToList('<?php echo $templatedir; ?>','<?php echo $appendtype; ?>','<?php echo $title; ?>','<?php echo $link; ?>','<?php echo $itemid; ?>','<?php echo $parent_id ?>','<?php echo $description; ?>')" name="<?php echo $title; ?>" value="<?php echo $link; ?>"><img alt="Add to Custom Menu" title="Add to Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-add.png" /></a> </dt>
                     </dl>
-                    <?php 
-                    
+                    <?php
+
                         //Do recursion
                         $counter = wp_custom_navigation_default_sub_items($itemid, $counter, $parent_id, $type, 'default');
-                        
+
                     ?>
                 </li>
-                      
-                <?php 
-            }
-            
+
+                <?php
+            }
+
         }
         ?>
-        
+
         </ul>
-        
-    <?php 
-    }
-    
+
+    <?php
+    }
+
     return $counter;
 
@@ -892 +892 @@
 
     $counter = $intCounter;
-    
+
     global $wpdb;
-    
-    
-    
-    //Get Sub Category Items            
+
+
+
+    //Get Sub Category Items
     if ($type == 'categories')
     {
@@ -904 +904 @@
             'hide_empty'  => false,
             'parent' => $childof);
-        $sub_array = get_categories($sub_args); 
+        $sub_array = get_categories($sub_args);
     }
     //Get Sub Page Items
@@ -912 +912 @@
             'child_of' => $childof,
             'parent' => $childof);
-    
+
         $sub_array = get_pages($sub_args);
-        
+
     }
     else {
-    
-    }
-    
+
+    }
+
     if ($sub_array)
     {
@@ -929 +929 @@
             }
             elseif (isset($sub_item->post_parent)) {
-                $sub_item_parent = $sub_item->post_parent; 
+                $sub_item_parent = $sub_item->post_parent;
             }
             else {
@@ -938 +938 @@
                 //Prepare Menu Data
                 //Category Menu Item
-                if ($type == 'categories') 
+                if ($type == 'categories')
                 {
                     $link = get_category_link($sub_item->cat_ID);
@@ -958 +958 @@
                 }
                 //Custom Menu Item
-                else 
+                else
                 {
                     $title = '';
@@ -964 +964 @@
                     $appendtype= 'Custom';
                 }
-                
+
                 //CHECK for existing parent records
                 //echo $parent_id;
@@ -974 +974 @@
                     //$parent_id = 0;
                 }
-                
+
                 //INSERT item
                 $insert = "INSERT INTO ".$table_name." (position,post_id,parent_id,custom_title,custom_link,custom_description,menu_icon,link_type,menu_id,custom_anchor_title) "."VALUES ('".$counter."','".$itemid."','".$parent_id."','".$title."','".$link."','','','".$linktype."','".$menu_id."','".$title."')";
                 $results = $wpdb->query( $insert );
-     
+
                 $counter++;
                 $counter = get_children_menu_elements($itemid, $counter, $parent_id, $type, $menu_id, $table_name);
-            }   
+            }
             //Do nothing
             else {
-            
+
             }
         }

trunk/wp-includes/default-widgets.php

@@ -1010 +1010 @@
     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);      
-    }
-
-    function widget($args, $instance) {  
+        parent::WP_Widget(false, __('Custom Navigation Menu'),$widget_ops);
+    }
+
+    function widget($args, $instance) {
         $navmenu = $instance['navmenu'];
         $navtitle = $instance['navtitle'];
@@ -1023 +1023 @@
         $navulid = $instance['navulid'];
         $navulclass = $instance['navulclass'];
-        
+
         //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
         {
@@ -1035 +1035 @@
         }
         $menuexists = false;
-        
+
         global $wpdb;
-        
+
         //GET menu name
         if ($navmenu > 0)
@@ -1047 +1047 @@
         }
         //Do nothing
-        else 
+        else
         {
             $menuexists = false;
         }
         ?>
-        
-        <?php 
+
+        <?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 
+                    <?php
                 }
                 //Do NOT display DIV
-                else 
+                else
                 {
-                    
-                } 
-                
-            } 
+
+                }
+
+            }
             //DISPLAY default DIV
-            else 
+            else
             {
                 ?>
                 <div class="widget">
-                <?php 
+                <?php
             }
         ?>
-        
+
             <h3><?php echo $navtitle; ?></h3>
-            <?php 
-            
-            if ($menuexists) 
+            <?php
+
+            if ($menuexists)
             {
                 ?>
-                <?php 
-                
+                <?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 
+                        <?php
                     }
                     //Do NOT display UL
-                    else 
+                    else
                     {
-                        
-                    } 
-                    
-                } 
+
+                    }
+
+                }
                 //DISPLAY default UL
-                else 
+                else
                 {
                     ?>
                     <ul class="custom-nav">
-                    <?php 
+                    <?php
                 }
-                
+
                 ?>
-                
+
                         <?php
                             //DISPLAY custom navigation menu
                             if (get_option('wp_custom_nav_menu') == 'true') {
                                 custom_nav('name='.$wp_custom_nav_menu_name.'&desc='.$navwidgetdescription);
-                            }               
+                            }
                         ?>
-                
-                <?php 
-                
+
+                <?php
+
                     //DEVELOPER settings enabled
-                    if ($navdeveloper == 'yes') 
-                    { 
+                    if ($navdeveloper == 'yes')
+                    {
                         //DISPLAY Custom UL
-                        if ($navul == 'yes') 
-                        { 
+                        if ($navul == 'yes')
+                        {
                             ?>
                             </ul>
-                            <?php 
+                            <?php
                         }
                         //Do NOT display UL
-                        else 
+                        else
                         {
-                            
-                        } 
-                        
-                    } 
+
+                        }
+
+                    }
                     //DISPLAY default UL
-                    else 
+                    else
                     {
                         ?>
                         </ul>
-                        <?php 
+                        <?php
                     }
-                    
+
                 ?>
             <?php
@@ -1157 +1157 @@
             }
             ?>
-        <?php 
+        <?php
             //DEVELOPER settings enabled
-            if ($navdeveloper == 'yes') 
-            { 
+            if ($navdeveloper == 'yes')
+            {
                 //DISPLAY Custom DIV
-                if ($navdiv == 'yes') 
-                { 
+                if ($navdiv == 'yes')
+                {
                     ?>
                     </div>
-                    <?php 
+                    <?php
                 }
                 //Do NOT display DIV
-                else 
+                else
                 {
-                    
-                } 
-                
-            } 
+
+                }
+
+            }
             //DISPLAY default DIV
-            else 
+            else
             {
                 ?>
                 </div>
-                <?php 
+                <?php
             }
         ?><!-- /#nav-container -->
-            
+
             <?php
     }
 
-    function update($new_instance, $old_instance) {                
+    function update($new_instance, $old_instance) {
         return $new_instance;
     }
 
-    function form($instance) {        
+    function form($instance) {
         $navmenu = esc_attr($instance['navmenu']);
         $navtitle = esc_attr($instance['navtitle']);
@@ -1202 +1202 @@
         $navulclass = esc_attr($instance['navulclass']);
         $navwidgetdescription = esc_attr($instance['navwidgetdescription']);
-                
+
         global $wpdb;
-                
-        //GET Menu Items for SELECT OPTIONS     
+
+        //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)
         {
-        
+
             ?>
-            
+
              <p>
                 <label for="<?php echo $this->get_field_id('navmenu'); ?>"><?php _e('Select Menu:'); ?></label>
-                
+
                 <select id="<?php echo $this->get_field_id('navmenu'); ?>" name="<?php echo $this->get_field_name('navmenu'); ?>">
-                    <?php 
-                    
+                    <?php
+
                     //DISPLAY SELECT OPTIONS
                     foreach ($custom_menu_records as $custom_menu_record)
@@ -1233 +1233 @@
                         <option value="<?php echo $custom_menu_record->id; ?>" <?php echo $selected_option; ?>><?php echo $custom_menu_record->menu_name; ?></option>
                         <?php
-                        
+
                     }
                     ?>
                 </select>
-    
+
             </p>
-            
+
             <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'); ?>" />
             </p>
-            
+
             <p>
             <?php
                 $checked = strtolower($navdeveloper);
             ?>
-            
-            <label for="<?php echo $this->get_field_id('navdeveloper'); ?>"><?php _e('Advanced Options:'); ?></label><br />     
+
+            <label for="<?php echo $this->get_field_id('navdeveloper'); ?>"><?php _e('Advanced Options:'); ?></label><br />
             <span class="checkboxes">
                 <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navdeveloper'); ?>" name="<?php echo $this->get_field_name('navdeveloper'); ?>" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
                 <label>No</label><input type="radio" id="<?php echo $this->get_field_name('navdeveloper'); ?>" name="<?php echo $this->get_field_name('navdeveloper'); ?>" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
             </span><!-- /.checkboxes -->
-            
+
             </p>
-            
-            <?php 
-            
+
+            <?php
+
             //DEVELOPER settings
             if ($checked == 'yes')
             {
                 ?>
-                
+
                 <p>
                 <?php
                     $checked = strtolower($navdiv);
                 ?>
-                
-                <label for="<?php echo $this->get_field_id('navdiv'); ?>"><?php _e('Wrap in container DIV:'); ?></label><br />  
+
+                <label for="<?php echo $this->get_field_id('navdiv'); ?>"><?php _e('Wrap in container DIV:'); ?></label><br />
                 <span class="checkboxes">
                     <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navdiv'); ?>" name="<?php echo $this->get_field_name('navdiv'); ?>" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
                     <label>No</label><input type="radio" id="<?php echo $this->get_field_name('navdiv'); ?>" name="<?php echo $this->get_field_name('navdiv'); ?>" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
                 </span><!-- /.checkboxes -->
-            
+
             </p>
-            
+
             <?php
-            
+
             if ($checked == 'yes')
             {
-            
+
                 ?>
-                
+
                 <p>
-                
+
                     <label for="<?php echo $this->get_field_id('navdivid'); ?>"><?php _e('DIV id:'); ?></label>
                     <input type="text" name="<?php echo $this->get_field_name('navdivid'); ?>" value="<?php echo $navdivid; ?>" class="widefat" id="<?php echo $this->get_field_id('navdivid'); ?>" />
                 </p>
                 <p>
-                
+
                     <label for="<?php echo $this->get_field_id('navdivclass'); ?>"><?php _e('DIV class:'); ?></label>
                     <input type="text" name="<?php echo $this->get_field_name('navdivclass'); ?>" value="<?php echo $navdivclass; ?>" class="widefat" id="<?php echo $this->get_field_id('navdivclass'); ?>" />
                 </p>
-                
+
                 <?php
-                
+
             }
-            
+
             ?>
-            
+
             <p>
                 <?php
                     $checked = strtolower($navul);
                 ?>
-                
-                <label for="<?php echo $this->get_field_id('navul'); ?>"><?php _e('Wrap in container UL:'); ?></label><br />        
+
+                <label for="<?php echo $this->get_field_id('navul'); ?>"><?php _e('Wrap in container UL:'); ?></label><br />
                 <span class="checkboxes">
                     <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navul'); ?>" name="<?php echo $this->get_field_name('navul'); ?>" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
                     <label>No</label><input type="radio" id="<?php echo $this->get_field_name('navul'); ?>" name="<?php echo $this->get_field_name('navul'); ?>" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
                 </span><!-- /.checkboxes -->
-            
+
             </p>
-            
+
             <?php
-        
+
             if ($checked == 'yes')
             {
-            
+
                 ?>
-                
+
                 <p>
-                
+
                     <label for="<?php echo $this->get_field_id('navulid'); ?>"><?php _e('UL id:'); ?></label>
                     <input type="text" name="<?php echo $this->get_field_name('navulid'); ?>" value="<?php echo $navulid; ?>" class="widefat" id="<?php echo $this->get_field_id('navulid'); ?>" />
                 </p>
                 <p>
-                
+
                     <label for="<?php echo $this->get_field_id('navulclass'); ?>"><?php _e('UL class:'); ?></label>
                     <input type="text" name="<?php echo $this->get_field_name('navulclass'); ?>" value="<?php echo $navulclass; ?>" class="widefat" id="<?php echo $this->get_field_id('navulclass'); ?>" />
                 </p>
-                
+
                 <?php
-                
+
             }
-            
+
             ?>
             <?php $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options'); ?>
             <p <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?>>
-            
+
                <?php
                     $checked = strtolower($navwidgetdescription);
                 ?>
-                
-                <label for="<?php echo $this->get_field_id('navwidgetdescription'); ?>"><?php _e('Show Top Level Descriptions:'); ?></label><br />      
+
+                <label for="<?php echo $this->get_field_id('navwidgetdescription'); ?>"><?php _e('Show Top Level Descriptions:'); ?></label><br />
                 <span class="checkboxes">
                     <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navwidgetdescription'); ?>" name="<?php echo $this->get_field_name('navwidgetdescription'); ?>" value="1" <?php if ($checked=='1') { echo 'checked="checked"'; } ?> />
@@ -1352 +1352 @@
                 </span><!-- /.checkboxes -->
             </p>
-                <?php 
+                <?php
             }
             //Do nothing
-            else 
+            else
             {
-                
+
             }
-            
+
         }
         //Error message for menus not existing
-        else 
+        else
         {
             ?>
@@ -1371 +1371 @@
         }
     }
-    
+
 }
 
@@ -1409 +1409 @@
 
     register_widget('WP_Widget_Tag_Cloud');
-    
+
     register_widget('WP_CustomNavWidget');
-    
+
     do_action('widgets_init');
 }

trunk/wp-includes/deprecated.php

@@ -2063 +2063 @@
  * @deprecated 2.8.0
  * @deprecated Use esc_url_raw()
- * @see esc_url_raw() 
+ * @see esc_url_raw()
  *
  * @param string $url The URL to be cleaned.

trunk/wp-includes/functions.php

@@ -611 +611 @@
  *
  * @package WordPress
- * @subpackage Option 
+ * @subpackage Option
  * @since 1.2.0
  *

trunk/wp-includes/general-template.php

@@ -714 +714 @@
 
     $tag = $wp_query->get_queried_object();;
-    
+
     if ( ! $tag )
         return;

trunk/wp-includes/http.php

@@ -1013 +1013 @@
                 'protocol_version' => (float) $r['httpversion'],
                 'header' => $strHeaders,
-                'ignore_errors' => true, // Return non-200 requests. 
+                'ignore_errors' => true, // Return non-200 requests.
                 'timeout' => $r['timeout'],
                 'ssl' => array(

trunk/wp-includes/ms-default-constants.php

@@ -35 +35 @@
 function ms_cookie_constants(  ) {
     global $current_site;
-    
+
     /**
      * @since 1.2.0

trunk/wp-includes/script-loader.php

@@ -398 +398 @@
 
     }
-    
+
     //Custom Navigation
 
     $scripts->add( 'custom-navigation-ui-custom', '/wp-admin/js/custom-navigation-custom-jquery-ui-1.7.2.js', array('jquery'), '1.7.2' );
     $scripts->add_data( 'custom-navigation-ui-custom', 'group', 1 );
-    
+
     $scripts->add( 'custom-navigation-default-items', "/wp-admin/js/custom-navigation-default-items$suffix.js", false, '20100220' );
     $scripts->add( 'custom-navigation-dynamic-functions', "/wp-admin/js/custom-navigation-dynamic-functions$suffix.js", false, '20100220' );
     $scripts->add( 'custom-navigation-php-functions', "/wp-admin/js/custom-navigation-php-functions$suffix.js", false, '20100220' );
-    
+
 }
 
@@ -474 +474 @@
     $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
     $styles->add( 'custom-navigation', "/wp-admin/css/custom-navigation$suffix.css", array(), '20100215' );
-    
+
     foreach ( $rtl_styles as $rtl_style )
         $styles->add_data( $rtl_style, 'rtl', true );

trunk/wp-includes/taxonomy.php

@@ -244 +244 @@
             $args[$cap] = 'manage_categories';
     }
-    
+
     if ( empty($args['singular_label']) )
         $args['singular_label'] = $args['label'];

trunk/wp-includes/template-loader.php

@@ -15 +15 @@
     return;
 elseif ( is_trackback() ) :
-    include( ABSPATH . 'wp-trackback.php' );    
+    include( ABSPATH . 'wp-trackback.php' );
     return;
 endif;

trunk/wp-settings.php

@@ -44 +44 @@
 wp_check_php_mysql_versions();
 
-// Check if we have recieved a request due to missing favicon.ico 
+// Check if we have recieved a request due to missing favicon.ico
 wp_favicon_request();