Ticket #12377: deprecated_functions_removed.12377.diff

wp-admin/ms-edit.php

@@ -537 +537 @@
                         wp_die( __('Missing email.') );
 
                 $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 )
                         wp_die( __('Duplicated username or email address.') );

wp-admin/includes/template.php

@@ -2628 +2628 @@
         if ( $post->post_type != 'attachment' )
                 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'] );
 ?>

wp-admin/ms-sites.php

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

wp-admin/user-new.php

@@ -83 +83 @@
                                 $add_user_errors = $user_details[ 'errors' ];
                         } 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 );
                                         $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );