Changeset 11383 for trunk/wp-includes/general-template.php

Timestamp:

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

Author:

markjaquith

Message:

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

File:

• trunk/wp-includes/general-template.php (modified) (6 diffs)

trunk/wp-includes/general-template.php

@@ -142 +142 @@
 function wp_loginout($redirect = '') {
         if ( ! is_user_logged_in() )
-                $link = '<a href="' . clean_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
+                $link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
         else
-                $link = '<a href="' . clean_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+                $link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
 
         echo apply_filters('loginout', $link);
@@ -690 +690 @@
         $text = wptexturize($text);
         $title_text = esc_attr($text);
-        $url = clean_url($url);
+        $url = esc_url($url);
 
         if ('link' == $format)
@@ -1808 +1808 @@
                         $link = add_query_arg( $add_args, $link );
                 $link .= $add_fragment;
-                $page_links[] = "<a class='prev page-numbers' href='" . clean_url($link) . "'>$prev_text</a>";
+                $page_links[] = "<a class='prev page-numbers' href='" . esc_url($link) . "'>$prev_text</a>";
         endif;
         for ( $n = 1; $n <= $total; $n++ ) :
@@ -1822 +1822 @@
                                         $link = add_query_arg( $add_args, $link );
                                 $link .= $add_fragment;
-                                $page_links[] = "<a class='page-numbers' href='" . clean_url($link) . "'>$n_display</a>";
+                                $page_links[] = "<a class='page-numbers' href='" . esc_url($link) . "'>$n_display</a>";
                                 $dots = true;
                         elseif ( $dots && !$show_all ) :
@@ -1836 +1836 @@
                         $link = add_query_arg( $add_args, $link );
                 $link .= $add_fragment;
-                $page_links[] = "<a class='next page-numbers' href='" . clean_url($link) . "'>$next_text</a>";
+                $page_links[] = "<a class='next page-numbers' href='" . esc_url($link) . "'>$next_text</a>";
         endif;
         switch ( $type ) :
@@ -1936 +1936 @@
         }
 
-        echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . clean_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
+        echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
         if ( 'rtl' == get_bloginfo( 'text_direction' ) )
-                echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . clean_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
+                echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
 }