Ticket #4051: 4051.diff

wp-includes/bookmark-template.php

@@ -16 +16 @@
         }
 
         $defaults = array(
-                'category' => -1, 'before' => '', 
-                'after' => '<br />', 'between' => ' ', 
-                'show_images' => true, 'orderby' => 'name', 
-                'show_description' => true, 'show_rating' => false, 
-                'limit' => -1, 'show_updated' => true, 
+                'category' => -1, 'before' => '',
+                'after' => '<br />', 'between' => ' ',
+                'show_images' => true, 'orderby' => 'name',
+                'show_description' => true, 'show_rating' => false,
+                'limit' => -1, 'show_updated' => true,
                 'echo' => true
         );
 
@@ -241 +241 @@
 
 function _walk_bookmarks($bookmarks, $args = '' ) {
         $defaults = array(
-                'show_updated' => 0, 'show_description' => 0, 
-                'show_images' => 1, 'before' => '<li>', 
+                'show_updated' => 0, 'show_description' => 0,
+                'show_images' => 1, 'before' => '<li>',
                 'after' => '</li>', 'between' => "\n"
         );
 
@@ -258 +258 @@
 
                 $the_link = '#';
                 if ( !empty($bookmark->link_url) )
-                        $the_link = clean_url($bookmark->link_url);
+                        $the_link = apply_filters('bookmark_url',$bookmark->link_url);
 
                 $rel = $bookmark->link_rel;
                 if ( '' != $rel )
                         $rel = ' rel="' . $rel . '"';
 
-                $desc = attribute_escape(apply_filters('link_description', $bookmark->link_description)); 
-                $name = attribute_escape(apply_filters('link_title', $bookmark->link_name)); 
+                $desc = attribute_escape(apply_filters('link_description', $bookmark->link_description));
+                $name = attribute_escape(apply_filters('link_title', $bookmark->link_name));
                 $title = $desc;
 
                 if ( $show_updated )
@@ -315 +315 @@
 
 function wp_list_bookmarks($args = '') {
         $defaults = array(
-                'orderby' => 'name', 'order' => 'ASC', 
-                'limit' => -1, 'category' => '', 
-                'category_name' => '', 'hide_invisible' => 1, 
-                'show_updated' => 0, 'echo' => 1, 
-                'categorize' => 1, 'title_li' => __('Bookmarks'), 
-                'title_before' => '<h2>', 'title_after' => '</h2>', 
-                'category_orderby' => 'name', 'category_order' => 'ASC', 
-                'class' => 'linkcat', 'category_before' => '<li id="%id" class="%class">', 
+                'orderby' => 'name', 'order' => 'ASC',
+                'limit' => -1, 'category' => '',
+                'category_name' => '', 'hide_invisible' => 1,
+                'show_updated' => 0, 'echo' => 1,
+                'categorize' => 1, 'title_li' => __('Bookmarks'),
+                'title_before' => '<h2>', 'title_after' => '</h2>',
+                'category_orderby' => 'name', 'category_order' => 'ASC',
+                'class' => 'linkcat', 'category_before' => '<li id="%id" class="%class">',
                 'category_after' => '</li>'
         );
 

wp-includes/default-filters.php

@@ -158 +158 @@
 add_filter('option_siteurl', '_config_wp_siteurl');
 add_filter('mce_plugins', '_mce_load_rtl_plugin');
 add_filter('mce_buttons', '_mce_add_direction_buttons');
+add_filter('bookmark_url','clean_url');
 
 // Redirect Old Slugs
 add_action('template_redirect', 'wp_old_slug_redirect');