Changeset 8441
- Timestamp:
- 07/24/2008 09:40:40 PM (17 years ago)
- Location:
- branches/crazyhorse/wp-admin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/crazyhorse/wp-admin/includes/media.php
r8422 r8441 339 339 } 340 340 341 return wp_iframe( 'media_edit_single_form', $id );341 return wp_iframe( 'media_edit_single_form', $id, $errors ); 342 342 } 343 343 … … 724 724 725 725 // crazyhorse 726 function media_edit_single_form($attachment_id = 0 ) {726 function media_edit_single_form($attachment_id = 0, $errors = null) { 727 727 global $redir_tab; 728 728 … … 744 744 745 745 media_upload_header(); 746 747 if ( $errors ) : 748 ?> 749 750 <div id="media-upload-notice"> 751 <?php if (isset($errors['upload_notice']) ) { ?> 752 <?php echo $errors['upload_notice']; ?> 753 <?php } ?> 754 </div> 755 <div id="media-upload-error"> 756 <?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?> 757 <?php echo $errors['upload_error']->get_error_message(); ?> 758 <?php } ?> 759 </div> 760 761 <?php 762 return; 763 endif; // errors 746 764 ?> 747 765 … … 1326 1344 </div> 1327 1345 1346 <?php if ( 'false' !== $_GET['library'] ) : ?> 1347 1328 1348 <div id="html-upload-help"><?php _e('Or select from your Media Library'); ?></div> 1329 1349 … … 1352 1372 </form> 1353 1373 <?php 1374 1375 endif; // library 1354 1376 } 1355 1377 -
branches/crazyhorse/wp-admin/upload.php
r8295 r8441 83 83 $h2_tag = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with “%s”'), single_tag_title('', false) ) : ''; 84 84 $h2_month = isset($_GET['m']) && $_GET['m'] ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : ''; 85 printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s (<a href="%7$s" class="thickbox">Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'media-upload.php? TB_iframe=true' );85 printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s (<a href="%7$s" class="thickbox">Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'media-upload.php?library=false&TB_iframe=true' ); 86 86 } 87 87 ?></h2>
Note: See TracChangeset
for help on using the changeset viewer.