Ticket #15920: 15920-take3.patch
File 15920-take3.patch, 4.6 KB (added by , 15 years ago) |
---|
-
wp-admin/network/themes.php
37 37 check_admin_referer('enable-theme_' . $_GET['theme']); 38 38 $allowed_themes[ $_GET['theme'] ] = true; 39 39 update_site_option( 'allowedthemes', $allowed_themes ); 40 wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message41 exit; 40 wp_redirect( add_query_arg( 'update', 'enabled', wp_get_referer() ) ); 41 exit; 42 42 break; 43 43 case 'disable': 44 44 check_admin_referer('disable-theme_' . $_GET['theme']); 45 45 unset( $allowed_themes[ $_GET['theme'] ] ); 46 46 update_site_option( 'allowedthemes', $allowed_themes ); 47 wp_redirect( wp_get_referer() ); // @todo add_query_arg for update message47 wp_redirect( add_query_arg( 'update', 'disabled', wp_get_referer() ) ); 48 48 exit; 49 49 break; 50 50 case 'enable-selected': 51 51 check_admin_referer('bulk-themes'); 52 52 $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array(); 53 53 if ( empty($themes) ) { 54 wp_redirect( wp_get_referer() );54 wp_redirect( add_query_arg( 'update', 'error', wp_get_referer() ) ); 55 55 exit; 56 } 56 } 57 57 foreach( (array) $themes as $theme ) 58 58 $allowed_themes[ $theme ] = true; 59 59 update_site_option( 'allowedthemes', $allowed_themes ); 60 wp_redirect( add_query_arg( array( 'update' => 'enabled', 'n' => count( $themes ) ), wp_get_referer() ) ); 61 exit; 60 62 break; 61 63 case 'disable-selected': 62 64 check_admin_referer('bulk-themes'); 63 65 $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array(); 64 66 if ( empty($themes) ) { 65 wp_redirect( wp_get_referer() );67 wp_redirect( add_query_arg( 'update', 'error', wp_get_referer() ) ); 66 68 exit; 67 } 69 } 68 70 foreach( (array) $themes as $theme ) 69 71 unset( $allowed_themes[ $theme ] ); 70 72 update_site_option( 'allowedthemes', $allowed_themes ); 73 wp_redirect( add_query_arg( array( 'update' => 'disabled', 'n' => count( $themes ) ), wp_get_referer() ) ); 74 exit; 71 75 break; 72 76 case 'delete-selected': 73 77 if ( ! current_user_can( 'delete_themes' ) ) … … 76 80 77 81 $themes = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array(); 78 82 if ( empty( $themes ) ) { 79 wp_redirect( wp_get_referer() );83 wp_redirect( add_query_arg( 'update', 'error', wp_get_referer() ) ); 80 84 exit; 81 85 } 82 86 … … 149 153 150 154 foreach ( $themes as $theme ) 151 155 $delete_result = delete_theme( $theme ); 152 wp_redirect( network_admin_url( 'themes.php? deleted=true') );156 wp_redirect( network_admin_url( 'themes.php?update=deleted&n=' . count($themes) ) ); 153 157 exit; 154 158 break; 155 159 } … … 174 178 175 179 require_once(ABSPATH . 'wp-admin/admin-header.php'); 176 180 177 if ( isset( $_GET['deleted'] ) ) : ?> 178 <div class="updated"><p><?php _e('Theme deleted.') ?></p></div><?php 179 elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) : ?> 181 if ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) : ?> 180 182 <div class="error"><p><?php _e( 'You cannot delete a theme while it is active on the main site.' ); ?></p></div><?php 181 183 endif; 182 184 ?> … … 188 190 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?> 189 191 </h2> 190 192 193 <?php 194 if ( isset( $_GET['update'] ) ) { 195 switch ( $_GET['update'] ) { 196 case 'enabled': 197 if ( !empty( $_GET['n'] ) ) 198 echo '<div id="message" class="updated"><p>' . sprintf( _n( '%s theme enabled.', '%s themes enabled.', $_GET['n'] ), number_format_i18n( $_GET['n'] ) ) . '</p></div>'; 199 else 200 echo '<div id="message" class="updated"><p>' . __( 'Theme enabled.' ) . '</p></div>'; 201 break; 202 case 'disabled': 203 if ( !empty( $_GET['n'] ) ) 204 echo '<div id="message" class="updated"><p>' . sprintf( _n( '%s theme disabled.', '%s themes disabled.', $_GET['n'] ), number_format_i18n( $_GET['n'] ) ) . '</p></div>'; 205 else 206 echo '<div id="message" class="updated"><p>' . __( 'Theme disabled.' ) . '</p></div>'; 207 break; 208 case 'deleted': 209 if ( !empty( $_GET['n'] ) ) 210 echo '<div id="message" class="updated"><p>' . sprintf( _n( '%s theme deleted.', '%s themes deleted.', $_GET['n'] ), number_format_i18n( $_GET['n'] ) ) . '</p></div>'; 211 else 212 echo '<div id="message" class="updated"><p>' . __( 'Theme deleted.' ) . '</p></div>'; 213 break; 214 case 'error': 215 echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>'; 216 break; 217 } 218 } 219 ?> 220 191 221 <form method="get" action=""> 192 222 <?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?> 193 223 </form>