Changeset 17201
- Timestamp:
- 01/01/2011 10:30:46 PM (13 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/class-wp-ms-users-list-table.php
r17189 r17201 172 172 case 'username': 173 173 $avatar = get_avatar( $user->user_email, 32 ); 174 $edit_link = ( get_current_user_id() == $user->ID ) ? 'profile.php' : 'user-edit.php?user_id=' . $user->ID; 174 if ( get_current_user_id() == $user->ID ) { 175 $edit_link = esc_url( network_admin_url( 'profile.php' ) ); 176 } else { 177 $edit_link = esc_url( network_admin_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ), 'user-edit.php?user_id=' . $user->ID ) ) ); 178 } 175 179 176 180 echo "<td $attributes>"; ?> 177 <?php echo $avatar; ?><strong><a href="<?php echo esc_url( self_admin_url( $edit_link ) ); ?>" class="edit"><?php echo stripslashes( $user->user_login ); ?></a><?php181 <?php echo $avatar; ?><strong><a href="<?php echo $edit_link; ?>" class="edit"><?php echo stripslashes( $user->user_login ); ?></a><?php 178 182 if ( in_array( $user->user_login, $super_admins ) ) 179 183 echo ' - ' . __( 'Super Admin' ); … … 182 186 <?php 183 187 $actions = array(); 184 $actions['edit'] = '<a href="' . esc_url( self_admin_url( $edit_link ) ). '">' . __( 'Edit' ) . '</a>';188 $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>'; 185 189 186 190 if ( current_user_can( 'delete_user', $user->ID) && ! in_array( $user->user_login, $super_admins ) ) { -
trunk/wp-admin/user-edit.php
r17161 r17201 148 148 if ( !is_wp_error( $errors ) ) { 149 149 $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true"; 150 $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect); 150 if ( $wp_http_referer ) 151 $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect); 151 152 wp_redirect($redirect); 152 153 exit; … … 169 170 <p><strong><?php _e('User updated.') ?></strong></p> 170 171 <?php if ( $wp_http_referer && !IS_PROFILE_PAGE ) : ?> 171 <p><a href=" users.php"><?php _e('← Back to Authors and Users'); ?></a></p>172 <p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('← Back to Authors and Users'); ?></a></p> 172 173 <?php endif; ?> 173 174 </div>
Note: See TracChangeset
for help on using the changeset viewer.