Changeset 13106

Timestamp:

02/13/2010 10:35:10 AM (17 years ago)

Author:

nacin

Message:

Don't use deprecated functions. see #11388

Location:

trunk

Files:

• wp-admin/includes/bookmark.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-admin/includes/user.php (modified) (1 diff)
• wp-admin/ms-edit.php (modified) (3 diffs)
• wp-admin/ms-options.php (modified) (1 diff)
• wp-admin/ms-sites.php (modified) (3 diffs)
• wp-admin/ms-themes.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-admin/user-new.php (modified) (2 diffs)
• wp-includes/ms-functions.php (modified) (5 diffs)
• wp-signup.php (modified) (1 diff)

trunk/wp-admin/includes/bookmark.php

@@ -247 +247 @@
         $link_id = (int) $linkdata['link_id'];
 
-        $link = get_link( $link_id, ARRAY_A );
+        $link = get_bookmark( $link_id, ARRAY_A );
 
         // Escape data pulled from DB.

trunk/wp-admin/includes/media.php

@@ -1147 +1147 @@
         global $redir_tab;
 
-        if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
+        if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id ) )
                 $thumb_url = $thumb_url[0];
         else

trunk/wp-admin/includes/ms.php

@@ -213 +213 @@
                 if ( is_array( $blog_allowed_themes ) ) {
                         foreach( (array) $themes as $key => $theme ) {
-                                $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
+                                $theme_key = esc_html( $theme[ 'Stylesheet' ] );
                                 if ( isset( $blog_allowed_themes[ $key ] ) == true ) {
                                         $blog_allowedthemes[ $theme_key ] = 1;
@@ -336 +336 @@
                 } else {
                         foreach( (array) $themes as $key => $theme ) {
-                                $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
+                                $theme_key = esc_html( $theme[ 'Stylesheet' ] );
                                 if ( isset( $allowed_themes[ $key ] ) == true ) {
                                         $allowedthemes[ $theme_key ] = 1;

trunk/wp-admin/includes/theme.php

@@ -143 +143 @@
                 $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
 
-        if ( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
-                $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] = true;
+        if ( isset( $allowed_themes[ esc_html( $ct->stylesheet ) ] ) == false )
+                $allowed_themes[ esc_html( $ct->stylesheet ) ] = true;
 
         reset( $themes );
         foreach ( $themes as $key => $theme ) {
-                if ( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false )
+                if ( isset( $allowed_themes[ esc_html( $theme[ 'Stylesheet' ] ) ] ) == false )
                         unset( $themes[ $key ] );
         }

trunk/wp-admin/includes/user.php

@@ -93 +93 @@
                         $user->user_url = '';
                 } else {
-                        $user->user_url = sanitize_url( $_POST['url'] );
+                        $user->user_url = esc_url_raw( $_POST['url'] );
                         $user->user_url = preg_match('/^(https?|ftps?|mailto|news|irc|gopher|nntp|feed|telnet):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
                 }

trunk/wp-admin/ms-edit.php

@@ -386 +386 @@
                         reset( $themes );
                         foreach ( (array) $themes as $key => $theme ) {
-                                if ( $_POST['theme'][ wp_specialchars( $theme['Stylesheet'] ) ] == 'enabled' )
-                                        $allowed_themes[ wp_specialchars( $theme['Stylesheet'] ) ] = true;
+                                if ( $_POST['theme'][ esc_html( $theme['Stylesheet'] ) ] == 'enabled' )
+                                        $allowed_themes[ esc_html( $theme['Stylesheet'] ) ] = true;
                         }
                         update_site_option( 'allowedthemes', $allowed_themes );
@@ -414 +414 @@
                         <body id="error-page">
                                 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
-                                <form action='ms-edit.php?action=<?php echo wp_specialchars( $_GET[ 'action2' ] ) ?>' method='post'>
-                                        <input type='hidden' name='action' value='<?php echo wp_specialchars( $_GET['action2'] ) ?>' />
-                                        <input type='hidden' name='id' value='<?php echo wp_specialchars( $id ); ?>' />
+                                <form action='ms-edit.php?action=<?php echo esc_attr( $_GET[ 'action2' ] ) ?>' method='post'>
+                                        <input type='hidden' name='action' value='<?php echo esc_attr( $_GET['action2'] ) ?>' />
+                                        <input type='hidden' name='id' value='<?php echo esc_attr( $id ); ?>' />
                                         <input type='hidden' name='ref' value='<?php echo $referrer; ?>' />
                                         <?php wp_nonce_field( $_GET['action2'] ) ?>
-                                        <p><?php echo wp_specialchars( stripslashes($_GET['msg']) ); ?></p>
+                                        <p><?php echo esc_html( stripslashes($_GET['msg']) ); ?></p>
                                         <p class="submit"><input class="button" type='submit' value='<?php _e("Confirm"); ?>' /></p>
                                 </form>
@@ -500 +500 @@
 
                 $password = wp_generate_password();
-                $user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, wp_specialchars( $user['email'] ) );
+                $user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
                 if ( false == $user_id )

trunk/wp-admin/ms-options.php

@@ -281 +281 @@
                         $menu_items = apply_filters( 'mu_menu_items', array('plugins' => __('Plugins')) );
                         foreach ( (array) $menu_items as $key => $val ) {
-                                echo "<tr><th scope='row'>" . wp_specialchars($val) . "</th><td><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . checked($menu_perms[$key], '1', false) . " /></td></tr>";
+                                echo "<tr><th scope='row'>" . esc_html($val) . "</th><td><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . checked($menu_perms[$key], '1', false) . " /></td></tr>";
                         }
                         ?>

trunk/wp-admin/ms-sites.php

@@ -169 +169 @@
                                                                 if ( is_serialized($option->option_value) ) {
                                                                         if ( is_serialized_string($option->option_value) ) {
-                                                                                $option->option_value = wp_specialchars(maybe_unserialize($option->option_value), 'single');
+                                                                                $option->option_value = esc_html(maybe_unserialize($option->option_value), 'single');
                                                                         } else {
                                                                                 $option->option_value = "SERIALIZED DATA";
@@ -211 +211 @@
                                         $out = '';
                                         foreach ( $themes as $key => $theme ) {
-                                                $theme_key = wp_specialchars( $theme['Stylesheet'] );
+                                                $theme_key = esc_html( $theme['Stylesheet'] );
                                                 if ( ! isset($allowed_themes[$theme_key] ) ) {
                                                         $checked = ( isset($blog_allowed_themes[ $theme_key ]) ) ? 'checked="checked"' : '';
@@ -254 +254 @@
                                                                         <select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php
                                                                                 foreach ( $editblog_roles as $role => $role_assoc ){
-                                                                                        $name = translate_with_context($role_assoc['name']);
+                                                                                        $name = translate_user_role($role_assoc['name']);
                                                                                         $selected = ( $role == $existing_role ) ? 'selected="selected"' : '';
                                                                                         echo "<option {$selected} value=\"" . esc_attr($role) . "\">{$name}</option>";

trunk/wp-admin/ms-themes.php

@@ -38 +38 @@
                         foreach ( (array) $themes as $key => $theme ) {
                                 $total_theme_count++;
-                                $theme_key = wp_specialchars($theme['Stylesheet']);
+                                $theme_key = esc_html($theme['Stylesheet']);
                                 $class = ('alt' == $class) ? '' : 'alt';
                                 $class1 = $enabled = $disabled = '';

trunk/wp-admin/user-edit.php

@@ -71 +71 @@
         if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
                 $user->ID = $current_user->ID;
-                $user->user_email = wp_specialchars( trim( $new_email[ 'newemail' ] ) );
+                $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
                 if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
                         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );

trunk/wp-admin/user-new.php

@@ -28 +28 @@
 
 Please click the following link to activate your user account:
-%%s" ), get_bloginfo('name'), site_url(), wp_specialchars( $_REQUEST[ 'role' ] ) );
+%%s" ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) );
         }
         add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
@@ -56 +56 @@
                 if ( $user_details ) {
                         // Adding an existing user to this blog
-                        $new_user_email = wp_specialchars(trim($_REQUEST['email']));
+                        $new_user_email = esc_html(trim($_REQUEST['email']));
                         $redirect = 'user-new.php';
                         $username = $user_details->user_login;

trunk/wp-includes/ms-functions.php

@@ -868 +868 @@
         if ( isset( $_GET['redirect'] ) ) {
                 if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
-                        $url .= "&action=blogs&s=". wp_specialchars( substr( $_GET['redirect'], 2 ) );
+                        $url .= "&action=blogs&s=". esc_html( substr( $_GET['redirect'], 2 ) );
         } elseif ( isset( $_POST['redirect'] ) ) {
                 $url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
@@ -1156 +1156 @@
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
@@ -1175 +1175 @@
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key );
@@ -1479 +1479 @@
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = $welcome_email;
@@ -1512 +1512 @@
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = $welcome_email;

trunk/wp-signup.php

@@ -231 +231 @@
                 $errors = new WP_Error();
         if ( isset( $_POST[ 'signup_for' ] ) )
-                $signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
+                $signup[ esc_html( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
         else
                 $signup[ 'blog' ] = 'checked="checked"';