<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13106] trunk: Don't use deprecated functions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13106">13106</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-13 10:35:10 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use deprecated functions. see <a href="http://trac.wordpress.org/ticket/11388">#11388</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesbookmarkphp">trunk/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/bookmark.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/bookmark.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/includes/bookmark.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> function wp_update_link( $linkdata ) {
</span><span class="cx"> $link_id = (int) $linkdata['link_id'];
</span><span class="cx">
</span><del>- $link = get_link( $link_id, ARRAY_A );
</del><ins>+ $link = get_bookmark( $link_id, ARRAY_A );
</ins><span class="cx">
</span><span class="cx"> // Escape data pulled from DB.
</span><span class="cx"> $link = add_magic_quotes( $link );
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/includes/media.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -1146,7 +1146,7 @@
</span><span class="cx"> function get_media_item( $attachment_id, $args = null ) {
</span><span class="cx"> global $redir_tab;
</span><span class="cx">
</span><del>- if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = get_attachment_icon_src( $attachment_id ) )
</del><ins>+ if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id ) )
</ins><span class="cx"> $thumb_url = $thumb_url[0];
</span><span class="cx"> else
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/includes/ms.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_array( $blog_allowed_themes ) ) {
</span><span class="cx"> foreach( (array) $themes as $key => $theme ) {
</span><del>- $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
</del><ins>+ $theme_key = esc_html( $theme[ 'Stylesheet' ] );
</ins><span class="cx"> if ( isset( $blog_allowed_themes[ $key ] ) == true ) {
</span><span class="cx"> $blog_allowedthemes[ $theme_key ] = 1;
</span><span class="cx"> }
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> $allowed_themes = array();
</span><span class="cx"> } else {
</span><span class="cx"> foreach( (array) $themes as $key => $theme ) {
</span><del>- $theme_key = wp_specialchars( $theme[ 'Stylesheet' ] );
</del><ins>+ $theme_key = esc_html( $theme[ 'Stylesheet' ] );
</ins><span class="cx"> if ( isset( $allowed_themes[ $key ] ) == true ) {
</span><span class="cx"> $allowedthemes[ $theme_key ] = 1;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/includes/theme.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -142,12 +142,12 @@
</span><span class="cx"> if ( is_array( $blog_allowed_themes ) )
</span><span class="cx"> $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
</span><span class="cx">
</span><del>- if ( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
- $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] = true;
</del><ins>+ if ( isset( $allowed_themes[ esc_html( $ct->stylesheet ) ] ) == false )
+ $allowed_themes[ esc_html( $ct->stylesheet ) ] = true;
</ins><span class="cx">
</span><span class="cx"> reset( $themes );
</span><span class="cx"> foreach ( $themes as $key => $theme ) {
</span><del>- if ( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false )
</del><ins>+ if ( isset( $allowed_themes[ esc_html( $theme[ 'Stylesheet' ] ) ] ) == false )
</ins><span class="cx"> unset( $themes[ $key ] );
</span><span class="cx"> }
</span><span class="cx"> reset( $themes );
</span></span></pre></div>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/includes/user.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
</span><span class="cx"> $user->user_url = '';
</span><span class="cx"> } else {
</span><del>- $user->user_url = sanitize_url( $_POST['url'] );
</del><ins>+ $user->user_url = esc_url_raw( $_POST['url'] );
</ins><span class="cx"> $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;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/ms-edit.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -385,8 +385,8 @@
</span><span class="cx"> $themes = get_themes();
</span><span class="cx"> reset( $themes );
</span><span class="cx"> foreach ( (array) $themes as $key => $theme ) {
</span><del>- if ( $_POST['theme'][ wp_specialchars( $theme['Stylesheet'] ) ] == 'enabled' )
- $allowed_themes[ wp_specialchars( $theme['Stylesheet'] ) ] = true;
</del><ins>+ if ( $_POST['theme'][ esc_html( $theme['Stylesheet'] ) ] == 'enabled' )
+ $allowed_themes[ esc_html( $theme['Stylesheet'] ) ] = true;
</ins><span class="cx"> }
</span><span class="cx"> update_site_option( 'allowedthemes', $allowed_themes );
</span><span class="cx"> }
</span><span class="lines">@@ -413,12 +413,12 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body id="error-page">
</span><span class="cx"> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
</span><del>- <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 ); ?>' />
</del><ins>+ <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 ); ?>' />
</ins><span class="cx"> <input type='hidden' name='ref' value='<?php echo $referrer; ?>' />
</span><span class="cx"> <?php wp_nonce_field( $_GET['action2'] ) ?>
</span><del>- <p><?php echo wp_specialchars( stripslashes($_GET['msg']) ); ?></p>
</del><ins>+ <p><?php echo esc_html( stripslashes($_GET['msg']) ); ?></p>
</ins><span class="cx"> <p class="submit"><input class="button" type='submit' value='<?php _e("Confirm"); ?>' /></p>
</span><span class="cx"> </form>
</span><span class="cx"> </body>
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> wp_die( __('Missing email.') );
</span><span class="cx">
</span><span class="cx"> $password = wp_generate_password();
</span><del>- $user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, wp_specialchars( $user['email'] ) );
</del><ins>+ $user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
</ins><span class="cx">
</span><span class="cx"> if ( false == $user_id )
</span><span class="cx"> wp_die( __('Duplicated username or email address.') );
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/ms-options.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> $menu_perms = get_site_option( 'menu_items' );
</span><span class="cx"> $menu_items = apply_filters( 'mu_menu_items', array('plugins' => __('Plugins')) );
</span><span class="cx"> foreach ( (array) $menu_items as $key => $val ) {
</span><del>- 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>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/ms-sites.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> $disabled = '';
</span><span class="cx"> if ( is_serialized($option->option_value) ) {
</span><span class="cx"> if ( is_serialized_string($option->option_value) ) {
</span><del>- $option->option_value = wp_specialchars(maybe_unserialize($option->option_value), 'single');
</del><ins>+ $option->option_value = esc_html(maybe_unserialize($option->option_value), 'single');
</ins><span class="cx"> } else {
</span><span class="cx"> $option->option_value = "SERIALIZED DATA";
</span><span class="cx"> $disabled = ' disabled="disabled"';
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> $allowed_themes = array_keys( $themes );
</span><span class="cx"> $out = '';
</span><span class="cx"> foreach ( $themes as $key => $theme ) {
</span><del>- $theme_key = wp_specialchars( $theme['Stylesheet'] );
</del><ins>+ $theme_key = esc_html( $theme['Stylesheet'] );
</ins><span class="cx"> if ( ! isset($allowed_themes[$theme_key] ) ) {
</span><span class="cx"> $checked = ( isset($blog_allowed_themes[ $theme_key ]) ) ? 'checked="checked"' : '';
</span><span class="cx"> $out .= '<tr class="form-field form-required">
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php
</span><span class="cx"> foreach ( $editblog_roles as $role => $role_assoc ){
</span><del>- $name = translate_with_context($role_assoc['name']);
</del><ins>+ $name = translate_user_role($role_assoc['name']);
</ins><span class="cx"> $selected = ( $role == $existing_role ) ? 'selected="selected"' : '';
</span><span class="cx"> echo "<option {$selected} value=\"" . esc_attr($role) . "\">{$name}</option>";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/ms-themes.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> $class = '';
</span><span class="cx"> foreach ( (array) $themes as $key => $theme ) {
</span><span class="cx"> $total_theme_count++;
</span><del>- $theme_key = wp_specialchars($theme['Stylesheet']);
</del><ins>+ $theme_key = esc_html($theme['Stylesheet']);
</ins><span class="cx"> $class = ('alt' == $class) ? '' : 'alt';
</span><span class="cx"> $class1 = $enabled = $disabled = '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/user-edit.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> $new_email = get_option( $current_user->ID . '_new_email' );
</span><span class="cx"> if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
</span><span class="cx"> $user->ID = $current_user->ID;
</span><del>- $user->user_email = wp_specialchars( trim( $new_email[ 'newemail' ] ) );
</del><ins>+ $user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
</ins><span class="cx"> if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) )
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
</span><span class="cx"> wp_update_user( get_object_vars( $user ) );
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-admin/user-new.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> this email. This invitation will expire in a few days.
</span><span class="cx">
</span><span class="cx"> Please click the following link to activate your user account:
</span><del>-%%s" ), get_bloginfo('name'), site_url(), wp_specialchars( $_REQUEST[ 'role' ] ) );
</del><ins>+%%s" ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) );
</ins><span class="cx"> }
</span><span class="cx"> add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> $user_details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE user_login = %s AND user_email = %s", $user_login, $_REQUEST[ 'email' ] ) );
</span><span class="cx"> if ( $user_details ) {
</span><span class="cx"> // Adding an existing user to this blog
</span><del>- $new_user_email = wp_specialchars(trim($_REQUEST['email']));
</del><ins>+ $new_user_email = esc_html(trim($_REQUEST['email']));
</ins><span class="cx"> $redirect = 'user-new.php';
</span><span class="cx"> $username = $user_details->user_login;
</span><span class="cx"> $user_id = $user_details->ID;
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-includes/ms-functions.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -867,7 +867,7 @@
</span><span class="cx"> $url = wpmu_admin_redirect_add_updated_param( $url );
</span><span class="cx"> if ( isset( $_GET['redirect'] ) ) {
</span><span class="cx"> if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
</span><del>- $url .= "&action=blogs&s=". wp_specialchars( substr( $_GET['redirect'], 2 ) );
</del><ins>+ $url .= "&action=blogs&s=". esc_html( substr( $_GET['redirect'], 2 ) );
</ins><span class="cx"> } elseif ( isset( $_POST['redirect'] ) ) {
</span><span class="cx"> $url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
</span><span class="cx"> }
</span><span class="lines">@@ -1155,7 +1155,7 @@
</span><span class="cx"> $admin_email = get_site_option( "admin_email" );
</span><span class="cx"> if ( $admin_email == '' )
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><del>- $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
</del><ins>+ $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
</ins><span class="cx"> $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx"> $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 );
</span><span class="cx"> // TODO: Don't hard code activation link.
</span><span class="lines">@@ -1174,7 +1174,7 @@
</span><span class="cx"> $admin_email = get_site_option( "admin_email" );
</span><span class="cx"> if ( $admin_email == '' )
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><del>- $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
</del><ins>+ $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
</ins><span class="cx"> $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx"> $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 );
</span><span class="cx"> // TODO: Don't hard code activation link.
</span><span class="lines">@@ -1478,7 +1478,7 @@
</span><span class="cx"> if ( $admin_email == '' )
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx">
</span><del>- $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
</del><ins>+ $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
</ins><span class="cx"> $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx"> $message = $welcome_email;
</span><span class="cx">
</span><span class="lines">@@ -1511,7 +1511,7 @@
</span><span class="cx"> if ( $admin_email == '' )
</span><span class="cx"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx">
</span><del>- $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
</del><ins>+ $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
</ins><span class="cx"> $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
</span><span class="cx"> $message = $welcome_email;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (13105 => 13106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-02-13 09:59:16 UTC (rev 13105)
+++ trunk/wp-signup.php 2010-02-13 10:35:10 UTC (rev 13106)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> if ( !is_wp_error($errors) )
</span><span class="cx"> $errors = new WP_Error();
</span><span class="cx"> if ( isset( $_POST[ 'signup_for' ] ) )
</span><del>- $signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
</del><ins>+ $signup[ esc_html( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
</ins><span class="cx"> else
</span><span class="cx"> $signup[ 'blog' ] = 'checked="checked"';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>