<!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>[12628] trunk: Remove raquo.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12628">12628</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-07 03:40:03 +0000 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove raquo. see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.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="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (12627 => 12628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2010-01-07 03:24:24 UTC (rev 12627)
+++ trunk/wp-activate.php 2010-01-07 03:40:03 UTC (rev 12628)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> <br /><input type="text" name="key" id="key" value="" size="50" />
</span><span class="cx"> </p>
</span><span class="cx"> <p class="submit">
</span><del>- <input id="submit" type="submit" name="Submit" class="submit" value="<?php _e('Activate &raquo;') ?>" />
</del><ins>+ <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (12627 => 12628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-01-07 03:24:24 UTC (rev 12627)
+++ trunk/wp-admin/ms-admin.php 2010-01-07 03:40:03 UTC (rev 12628)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="action" value="users" />
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span><del>- <input class="button" type="submit" name="submit" value="<?php _e("Search Users &raquo;"); ?>" />
</del><ins>+ <input class="button" type="submit" name="submit" value="<?php esc_attr_e("Search Users"); ?>" />
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span><del>- <input class="button" type="submit" name="blog_name" value="<?php _e("Search Blogs &raquo;"); ?>" />
</del><ins>+ <input class="button" type="submit" name="blog_name" value="<?php esc_attr_e("Search Blogs"); ?>" />
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12627 => 12628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-01-07 03:24:24 UTC (rev 12627)
+++ trunk/wp-admin/ms-sites.php 2010-01-07 03:40:03 UTC (rev 12628)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><del>- <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php _esc_attr_e('Update Options &raquo;') ?>" /></p>
</del><ins>+ <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
</ins><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> <div id="blogedit_blogoptions" class="postbox " >
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> } // End foreach
</span><span class="cx"> ?>
</span><span class="cx"> </table>
</span><del>- <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
</del><ins>+ <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
</ins><span class="cx"> </div></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> <tr><th style="font-weight:bold;"><?php _e('Theme'); ?></th></tr>
</span><span class="cx"> <?php echo $out; ?>
</span><span class="cx"> </table>
</span><del>- <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
</del><ins>+ <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
</ins><span class="cx"> </div></div>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> echo '</tr>';
</span><span class="cx"> }
</span><span class="cx"> echo "</table>";
</span><del>- echo '<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="' . esc_attr__('Update Options &raquo;') . '" /></p>';
</del><ins>+ echo '<p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="' . esc_attr__('Update Options') . '" /></p>';
</ins><span class="cx"> echo "</div></div>";
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><del>- <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
</del><ins>+ <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
</ins><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> <div id="blogedit_miscoptions" class="postbox">
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <?php do_action( 'wpmueditblogaction', $id ); ?>
</span><span class="cx"> </table>
</span><del>- <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options &raquo;') ?>" /></p>
</del><ins>+ <p class="submit" style="margin:-15px 0 -5px 230px;"><input type="submit" name="Submit" value="<?php esc_attr_e('Update Options') ?>" /></p>
</ins><span class="cx"> </div></div>
</span><span class="cx">
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12627 => 12628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-07 03:24:24 UTC (rev 12627)
+++ trunk/wp-includes/ms-functions.php 2010-01-07 03:40:03 UTC (rev 12628)
</span><span class="lines">@@ -1895,10 +1895,10 @@
</span><span class="cx"> <p><?php printf(__('If you do not want to use your %s blog any more, you can delete it using the form below. When you click <strong>Delete My Blog</strong> you will be sent an email with a link in it. Click on this link to delete your blog.'), $current_site->site_name); ?></p>
</span><span class="cx"> <p><?php _e('Remember, once deleted your blog cannot be restored.') ?></p>
</span><span class="cx"> <form method='post' name='deletedirect'>
</span><del>- <input type="hidden" name="page" value="<?php echo $_GET['page'] ?>" />
</del><ins>+ <input type="hidden" name="page" value="<?php echo esc_attr($_GET['page']) ?>" />
</ins><span class="cx"> <input type='hidden' name='action' value='deleteblog' />
</span><span class="cx"> <p><input id='confirmdelete' type='checkbox' name='confirmdelete' value='1' /> <label for='confirmdelete'><strong><?php printf( __("I'm sure I want to permanently disable my blog, and I am aware I can never get it back or use %s again."), $current_blog->domain); ?></strong></label></p>
</span><del>- <p class="submit"><input type='submit' value='<?php _e('Delete My Blog Permanently &raquo;') ?>' /></p>
</del><ins>+ <p class="submit"><input type='submit' value='<?php esc_attr_e('Delete My Blog Permanently') ?>' /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (12627 => 12628)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-01-07 03:24:24 UTC (rev 12627)
+++ trunk/wp-signup.php 2010-01-07 03:40:03 UTC (rev 12628)
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx"> <?php }
</span><span class="cx">
</span><span class="cx"> if( constant( "VHOST" ) == 'no' ) {
</span><del>- echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
</del><ins>+ echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="50" /><br />';
</ins><span class="cx"> } else {
</span><del>- echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
</del><ins>+ echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
</ins><span class="cx"> }
</span><span class="cx"> if ( !is_user_logged_in() ) {
</span><span class="cx"> print '(<strong>' . __( 'Your address will be ' );
</span><span class="lines">@@ -86,7 +86,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_attr($blog_title).'" /></p>';
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div id="privacy">
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> if ( $errmsg = $errors->get_error_message('user_name') ) {
</span><span class="cx"> echo '<p class="error">'.$errmsg.'</p>';
</span><span class="cx"> }
</span><del>- echo '<input name="user_name" type="text" id="user_name" value="'.$user_name.'" maxlength="50" /><br />';
</del><ins>+ echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="50" /><br />';
</ins><span class="cx"> _e('(Must be at least 4 characters, letters and numbers only.)');
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
</span><span class="cx"> <p class="error"><?php echo $errmsg ?></p>
</span><span class="cx"> <?php } ?>
</span><del>- <input name="user_email" type="text" id="user_email" value="<?php echo wp_specialchars($user_email, 1) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
</del><ins>+ <input name="user_email" type="text" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
</ins><span class="cx"> <?php
</span><span class="cx"> if ( $errmsg = $errors->get_error_message('generic') ) {
</span><span class="cx"> echo '<p class="error">'.$errmsg.'</p>';
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> <input type="hidden" name="stage" value="gimmeanotherblog" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;') ?>" /></p>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Blog') ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </p>
</span><span class="cx">
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Next &raquo;') ?>" /></p>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -311,11 +311,11 @@
</span><span class="cx"> ?>
</span><span class="cx"> <form id="setupform" method="post" action="wp-signup.php">
</span><span class="cx"> <input type="hidden" name="stage" value="validate-blog-signup" />
</span><del>- <input type="hidden" name="user_name" value="<?php echo $user_name ?>" />
- <input type="hidden" name="user_email" value="<?php echo $user_email ?>" />
</del><ins>+ <input type="hidden" name="user_name" value="<?php echo esc_attr($user_name) ?>" />
+ <input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
</ins><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Signup &raquo;') ?>" /></p>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>