Changeset 11383 for trunk/wp-admin/includes/media.php

Timestamp:

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

Author:

markjaquith

Message:

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

File:

• trunk/wp-admin/includes/media.php (modified) (6 diffs)

trunk/wp-admin/includes/media.php

@@ -78 +78 @@
                 $class = " class='current'";
             $href = add_query_arg(array('tab'=>$callback, 's'=>false, 'paged'=>false, 'post_mime_type'=>false, 'm'=>false));
-            $link = "<a href='" . clean_url($href) . "'$class>$text</a>";
+            $link = "<a href='" . esc_url($href) . "'$class>$text</a>";
             echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
         }
@@ -108 +108 @@
 
     if ( $url )
-        $html = '<a href="' . clean_url($url) . "\"$rel>$html</a>";
+        $html = '<a href="' . esc_url($url) . "\"$rel>$html</a>";
 
     $html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url, $size );
@@ -1746 +1746 @@
 else
     $class = '';
-$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>";
+$type_links[] = "<li><a href='" . esc_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>";
 foreach ( $post_mime_types as $mime_type => $label ) {
     $class = '';
@@ -1756 +1756 @@
         $class = ' class="current"';
 
-    $type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
+    $type_links[] = "<li><a href='" . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
 }
 echo implode(' | </li>', $type_links) . '</li>';
@@ -2060 +2060 @@
 function media_upload_flash_bypass() {
     echo '<p class="upload-flash-bypass">';
-    printf( __('You are using the Flash uploader.  Problems?  Try the <a href="%s">Browser uploader</a> instead.'), clean_url(add_query_arg('flash', 0)) );
+    printf( __('You are using the Flash uploader.  Problems?  Try the <a href="%s">Browser uploader</a> instead.'), esc_url(add_query_arg('flash', 0)) );
     echo '</p>';
 }
@@ -2075 +2075 @@
         // the user manually selected the browser uploader, so let them switch back to Flash
         echo ' ';
-        printf( __('Try the <a href="%s">Flash uploader</a> instead.'), clean_url(add_query_arg('flash', 1)) );
+        printf( __('Try the <a href="%s">Flash uploader</a> instead.'), esc_url(add_query_arg('flash', 1)) );
     }
     echo "</p>\n";