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

Timestamp:

05/18/2009 04:00:33 PM (16 years ago)

Author:

markjaquith

Message:

Deprecate sanitize_url() and clean_url() in favor of esc_url_raw() and esc_url()

File:

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

trunk/wp-includes/default-widgets.php

@@ -660 +660 @@
             <ul id="recentcomments"><?php
             if ( $comments ) : foreach ( (array) $comments as $comment) :
-            echo  '<li class="recentcomments">' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '<a href="' . clean_url( get_comment_link($comment->comment_ID) ) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
+            echo  '<li class="recentcomments">' . /* translators: comments widget: 1: comment author, 2: post link */ sprintf(_x('%1$s on %2$s', 'widgets'), get_comment_author_link(), '<a href="' . esc_url( get_comment_link($comment->comment_ID) ) . '">' . get_the_title($comment->comment_post_ID) . '</a>') . '</li>';
             endforeach; endif;?></ul>
         <?php echo $after_widget; ?>
@@ -731 +731 @@
             if ( empty($title) )
                 $title = htmlentities(strip_tags($rss->get_title()));
-            $link = clean_url(strip_tags($rss->get_permalink()));
+            $link = esc_url(strip_tags($rss->get_permalink()));
             while ( stristr($link, 'http') != $link )
                 $link = substr($link, 1);
@@ -740 +740 @@
 
         $title = apply_filters('widget_title', $title );
-        $url = clean_url(strip_tags($url));
+        $url = esc_url(strip_tags($url));
         $icon = includes_url('images/rss.png');
         if ( $title )
@@ -814 +814 @@
         while ( stristr($link, 'http') != $link )
             $link = substr($link, 1);
-        $link = clean_url(strip_tags($link));
+        $link = esc_url(strip_tags($link));
         $title = esc_attr(strip_tags($item->get_title()));
         if ( empty($title) )
@@ -880 +880 @@
     $number = esc_attr( $number );
     $title  = esc_attr( $title );
-    $url    = clean_url( $url );
+    $url    = esc_url( $url );
     $items  = (int) $items;
     if ( $items < 1 || 20 < $items )
@@ -959 +959 @@
     if ( $items < 1 || 20 < $items )
         $items = 10;
-    $url           = sanitize_url(strip_tags( $widget_rss['url'] ));
+    $url           = esc_url_raw(strip_tags( $widget_rss['url'] ));
     $title         = trim(strip_tags( $widget_rss['title'] ));
     $show_summary  = (int) $widget_rss['show_summary'];
@@ -972 +972 @@
             $error = $rss->get_error_message();
         } else {
-            $link = clean_url(strip_tags($rss->get_permalink()));
+            $link = esc_url(strip_tags($rss->get_permalink()));
             while ( stristr($link, 'http') != $link )
                 $link = substr($link, 1);