Changeset 13423

Timestamp:

02/26/2010 12:41:23 AM (14 years ago)

Author:

nacin

Message:

Don't use deprecated functions. Fixes #12377 props filosofo.

Location:

trunk/wp-admin

Files:

• includes/template.php (modified) (1 diff)
• ms-edit.php (modified) (1 diff)
• ms-sites.php (modified) (1 diff)
• user-new.php (modified) (1 diff)

trunk/wp-admin/includes/template.php

@@ -2629 +2629 @@
         return false;
 
-    $icon = get_attachment_icon( $post->ID );
+    $icon = wp_get_attachment_image( $post->ID, 'thumbnail', true );
     $attachment_data = wp_get_attachment_metadata( $id );
     $thumb = isset( $attachment_data['thumb'] );

trunk/wp-admin/ms-edit.php

@@ -556 +556 @@
 
         $password = wp_generate_password();
-        $user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
+        $user_id = wpmu_create_user(esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
         if ( false == $user_id )

trunk/wp-admin/ms-sites.php

@@ -293 +293 @@
                                 reset( $editblog_roles );
                                 foreach ( $editblog_roles as $role => $role_assoc ){
-                                    $name = translate_with_context($role_assoc['name']);
+                                    $name = translate_user_role( $role_assoc['name'] );
                                     $selected = ( $role == $editblog_default_role ) ? 'selected="selected"' : '';
                                     echo "<option {$selected} value=\"" . esc_attr($role) . "\">{$name}</option>";

trunk/wp-admin/user-new.php

@@ -84 +84 @@
             } else {
                 $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
-                if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
+                if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin(get_current_user_id()) ) {
                     add_filter( 'wpmu_signup_user_notification', create_function('', '{return false;}') ); // Disable confirmation email
                 }
                 wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
-                if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
+                if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin(get_current_user_id()) ) {
                     $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' ] ) );
                     wpmu_activate_signup( $key );