Changeset 8441 for branches/crazyhorse/wp-admin/includes/media.php

Timestamp:

07/24/2008 09:40:40 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: don't show 'or select from media library' when uploading directly to the media library

File:

• branches/crazyhorse/wp-admin/includes/media.php (modified) (5 diffs)

branches/crazyhorse/wp-admin/includes/media.php

@@ -339 +339 @@
     }
 
-    return wp_iframe( 'media_edit_single_form', $id );
+    return wp_iframe( 'media_edit_single_form', $id, $errors );
 }
 
@@ -724 +724 @@
 
 // crazyhorse
-function media_edit_single_form($attachment_id = 0) {
+function media_edit_single_form($attachment_id = 0, $errors = null) {
     global $redir_tab;
 
@@ -744 +744 @@
 
     media_upload_header();
+
+    if ( $errors ) :
+?>
+
+<div id="media-upload-notice">
+<?php if (isset($errors['upload_notice']) ) { ?>
+    <?php echo $errors['upload_notice']; ?>
+<?php } ?>
+</div>
+<div id="media-upload-error">
+<?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?>
+    <?php echo $errors['upload_error']->get_error_message(); ?>
+<?php } ?>
+</div>
+
+<?php
+    return;
+    endif; // errors
 ?>
 
@@ -1326 +1344 @@
 </div>
 
+<?php if ( 'false' !== $_GET['library'] ) : ?>
+
 <div id="html-upload-help"><?php _e('Or select from your Media Library'); ?></div>
 
@@ -1352 +1372 @@
 </form>
 <?php
+
+endif; // library
 }