Changeset 12312
- Timestamp:
- 12/01/2009 11:28:20 PM (16 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/page.php
r12260 r12312 73 73 $action = 'preview'; 74 74 75 $sendback = wp_get_referer(); 76 if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false ) 77 $sendback = admin_url('edit-pages.php'); 78 else 79 $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback ); 80 75 81 switch($action) { 76 82 case 'post': … … 157 163 wp_die( __('Error in moving to trash...') ); 158 164 159 $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() ); 160 if ( strpos($sendback, 'page.php') !== false || strpos($sendback, 'page-new.php') !== false ) 161 $sendback = admin_url('edit-pages.php?trashed=1&ids='.$post_id); 162 else 163 $sendback = add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ); 164 165 wp_redirect($sendback); 165 wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) ); 166 166 exit(); 167 167 break; … … 179 179 wp_die( __('Error in restoring from trash...') ); 180 180 181 $sendback = wp_get_referer(); 182 if ( strpos($sendback, 'page.php') !== false ) 183 $sendback = admin_url('edit-pages.php?untrashed=1'); 184 else 185 $sendback = add_query_arg('untrashed', 1, $sendback); 186 187 wp_redirect($sendback); 181 wp_redirect( add_query_arg('untrashed', 1, $sendback) ); 188 182 exit(); 189 183 break; … … 206 200 } 207 201 208 $sendback = wp_get_referer(); 209 if ( strpos($sendback, 'page.php') !== false ) 210 $sendback = admin_url('edit-pages.php?deleted=1'); 211 else 212 $sendback = add_query_arg('deleted', 1, $sendback); 213 214 wp_redirect($sendback); 202 wp_redirect( add_query_arg('deleted', 1, $sendback) ); 215 203 exit(); 216 204 break; -
trunk/wp-admin/post.php
r12260 r12312 78 78 $action = 'preview'; 79 79 80 $sendback = wp_get_referer(); 81 if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false ) 82 $sendback = admin_url('edit.php'); 83 else 84 $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback ); 85 80 86 switch($action) { 81 87 case 'postajaxpost': … … 197 203 wp_die( __('Error in moving to trash...') ); 198 204 199 $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() ); 200 if ( strpos($sendback, 'post.php') !== false || strpos($sendback, 'post-new.php') !== false ) 201 $sendback = admin_url('edit.php?trashed=1&ids='.$post_id); 202 else 203 $sendback = add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ); 204 205 wp_redirect($sendback); 205 wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) ); 206 206 exit(); 207 207 break; … … 219 219 wp_die( __('Error in restoring from trash...') ); 220 220 221 $sendback = wp_get_referer(); 222 if ( strpos($sendback, 'post.php') !== false ) 223 $sendback = admin_url('edit.php?untrashed=1'); 224 else 225 $sendback = add_query_arg('untrashed', 1, $sendback); 226 227 wp_redirect($sendback); 221 wp_redirect( add_query_arg('untrashed', 1, $sendback) ); 228 222 exit(); 229 223 break; … … 246 240 } 247 241 248 $sendback = wp_get_referer(); 249 if ( strpos($sendback, 'post.php') !== false ) 250 $sendback = admin_url('edit.php?deleted=1'); 251 else 252 $sendback = add_query_arg('deleted', 1, $sendback); 253 254 wp_redirect($sendback); 242 wp_redirect( add_query_arg('deleted', 1, $sendback) ); 255 243 exit(); 256 244 break;
Note: See TracChangeset
for help on using the changeset viewer.