<!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>[BuddyPress] [3370] trunk: Use esc_html()
instead of deprecated wp_specialchars()</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3370</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-07 00:24:39 +0000 (Sun, 07 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use esc_html() instead of deprecated wp_specialchars()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogstemplatetagsphp">trunk/bp-blogs/bp-blogs-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcorefiltersphp">trunk/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunkbpcorebpcoresettingsphp">trunk/bp-core/bp-core-settings.php</a></li>
<li><a href="#trunkbpcorebpcoresignupphp">trunk/bp-core/bp-core-signup.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-templatetags.php (3369 => 3370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-templatetags.php 2010-11-07 00:20:02 UTC (rev 3369)
+++ trunk/bp-blogs/bp-blogs-templatetags.php 2010-11-07 00:24:39 UTC (rev 3370)
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
</span><span class="cx"> <p class="error"><?php echo $errmsg ?></p>
</span><span class="cx"> <?php }
</span><del>- echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
</del><ins>+ echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_html($blog_title, 1).'" /></p>';
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <p>
</span></span></pre></div>
<a id="trunkbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-filters.php (3369 => 3370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php 2010-11-07 00:20:02 UTC (rev 3369)
+++ trunk/bp-core/bp-core-filters.php 2010-11-07 00:24:39 UTC (rev 3370)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> if ( empty( $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 = sprintf(__("Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2$s", 'buddypress' ), $activate_url, esc_url("http://{$domain}{$path}" ) );
</span><span class="cx"> $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), esc_url('http://' . $domain . $path));
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> if ( is_admin() )
</span><span class="cx"> $email = '&e=1';
</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 = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email, esc_url( "http://{$domain}{$path}" ) );
</span><span class="cx"> $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
</span></span></pre></div>
<a id="trunkbpcorebpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-settings.php (3369 => 3370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-settings.php 2010-11-07 00:20:02 UTC (rev 3369)
+++ trunk/bp-core/bp-core-settings.php 2010-11-07 00:24:39 UTC (rev 3370)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> // Form has been submitted and nonce checks out, lets do it.
</span><span class="cx">
</span><span class="cx"> if ( $_POST['email'] != '' )
</span><del>- $current_user->user_email = wp_specialchars( trim( $_POST['email'] ) );
</del><ins>+ $current_user->user_email = esc_html( trim( $_POST['email'] ) );
</ins><span class="cx">
</span><span class="cx"> if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
</span><span class="cx"> if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) )
</span></span></pre></div>
<a id="trunkbpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-signup.php (3369 => 3370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-signup.php 2010-11-07 00:20:02 UTC (rev 3369)
+++ trunk/bp-core/bp-core-signup.php 2010-11-07 00:24:39 UTC (rev 3370)
</span><span class="lines">@@ -609,7 +609,7 @@
</span><span class="cx"> if ( empty( $admin_email ) )
</span><span class="cx"> $admin_email = 'noreply@' . $_SERVER['SERVER_NAME'];
</span><span class="cx">
</span><del>- $from_name = ( '' == get_option( 'blogname' ) ) ? 'BuddyPress' : wp_specialchars( get_option( 'blogname' ) );
</del><ins>+ $from_name = ( '' == get_option( 'blogname' ) ) ? 'BuddyPress' : esc_html( get_option( 'blogname' ) );
</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( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url );
</span><span class="cx"> $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (3369 => 3370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2010-11-07 00:20:02 UTC (rev 3369)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2010-11-07 00:24:39 UTC (rev 3370)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> $type = ( $type == 'error' ) ? 'error' : 'updated'; ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="<?php echo $type; ?> fade">
</span><del>- <p><?php echo wp_specialchars( esc_attr( $message ) ); ?></p>
</del><ins>+ <p><?php echo esc_html( esc_attr( $message ) ); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>