<!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>[13423] trunk/wp-admin: Don't use deprecated functions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13423">13423</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 00:41:23 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use deprecated functions. Fixes <a href="http://trac.wordpress.org/ticket/12377">#12377</a> props filosofo.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13422 => 13423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-26 00:37:20 UTC (rev 13422)
+++ trunk/wp-admin/includes/template.php 2010-02-26 00:41:23 UTC (rev 13423)
</span><span class="lines">@@ -2628,7 +2628,7 @@
</span><span class="cx"> if ( $post->post_type != 'attachment' )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $icon = get_attachment_icon( $post->ID );
</del><ins>+ $icon = wp_get_attachment_image( $post->ID, 'thumbnail', true );
</ins><span class="cx"> $attachment_data = wp_get_attachment_metadata( $id );
</span><span class="cx"> $thumb = isset( $attachment_data['thumb'] );
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (13422 => 13423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-02-26 00:37:20 UTC (rev 13422)
+++ trunk/wp-admin/ms-edit.php 2010-02-26 00:41:23 UTC (rev 13423)
</span><span class="lines">@@ -555,7 +555,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, esc_html( $user['email'] ) );
</del><ins>+ $user_id = wpmu_create_user(esc_html( 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="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (13422 => 13423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-02-26 00:37:20 UTC (rev 13422)
+++ trunk/wp-admin/ms-sites.php 2010-02-26 00:41:23 UTC (rev 13423)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> reset( $editblog_roles );
</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 == $editblog_default_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="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (13422 => 13423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-02-26 00:37:20 UTC (rev 13422)
+++ trunk/wp-admin/user-new.php 2010-02-26 00:41:23 UTC (rev 13423)
</span><span class="lines">@@ -83,11 +83,11 @@
</span><span class="cx"> $add_user_errors = $user_details[ 'errors' ];
</span><span class="cx"> } else {
</span><span class="cx"> $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
</span><del>- if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
</del><ins>+ if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin(get_current_user_id()) ) {
</ins><span class="cx"> add_filter( 'wpmu_signup_user_notification', create_function('', '{return false;}') ); // Disable confirmation email
</span><span class="cx"> }
</span><span class="cx"> wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
</span><del>- if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
</del><ins>+ if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin(get_current_user_id()) ) {
</ins><span class="cx"> $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
</span><span class="cx"> wpmu_activate_signup( $key );
</span><span class="cx"> $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
</span></span></pre>
</div>
</div>
</body>
</html>