WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Notice fixes, props sivel, see #9393 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-04-22 12:24:45 +00:00
parent a87fce21b6
commit a12587214f
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/admin.php
View File

@ -11,7 +11,8 @@
* *
* @since unknown * @since unknown
*/ */
define('WP_ADMIN', TRUE); if ( !defined('WP_ADMIN') )
define('WP_ADMIN', TRUE);
if ( defined('ABSPATH') ) if ( defined('ABSPATH') )
require_once(ABSPATH . 'wp-load.php'); require_once(ABSPATH . 'wp-load.php');

19
wp-admin/includes/media.php
View File

@ -396,6 +396,8 @@ function media_upload_form_handler() {
if ( isset($post['errors']) ) { if ( isset($post['errors']) ) {
$errors[$attachment_id] = $post['errors']; $errors[$attachment_id] = $post['errors'];
unset($post['errors']); unset($post['errors']);
} else {
$errors = array();
} }
if ( $post != $_post ) if ( $post != $_post )
@ -429,7 +431,7 @@ function media_upload_form_handler() {
return media_send_to_editor($html); return media_send_to_editor($html);
} }
return $errors; return isset($errors) ? $errors : '';
} }
/** /**
@ -987,7 +989,7 @@ function get_attachment_fields_to_edit($post, $errors = null) {
'label' => __('File URL'), 'label' => __('File URL'),
'input' => 'html', 'input' => 'html',
'html' => "<input type='text' class='urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='" . attribute_escape($image_url) . "' /><br />", 'html' => "<input type='text' class='urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='" . attribute_escape($image_url) . "' /><br />",
'value' => $edit_post->post_url, 'value' => isset($edit_post->post_url) ? $edit_post->post_url : '',
'helps' => __('Location of the uploaded file.'), 'helps' => __('Location of the uploaded file.'),
) )
); );
@ -1222,7 +1224,7 @@ function get_media_item( $attachment_id, $args = null ) {
foreach ( $hidden_fields as $name => $value ) foreach ( $hidden_fields as $name => $value )
$item .= "\t<input type='hidden' name='$name' id='$name' value='" . attribute_escape( $value ) . "' />\n"; $item .= "\t<input type='hidden' name='$name' id='$name' value='" . attribute_escape( $value ) . "' />\n";
if ( $post->post_parent < 1 && (int) $_REQUEST['post_id'] ) { if ( $post->post_parent < 1 && isset($_REQUEST['post_id']) ) {
$parent = (int) $_REQUEST['post_id']; $parent = (int) $_REQUEST['post_id'];
$parent_name = "attachments[$attachment_id][post_parent]"; $parent_name = "attachments[$attachment_id][post_parent]";
@ -1700,7 +1702,7 @@ function media_upload_library_form($errors) {
<input type="hidden" name="type" value="<?php echo attribute_escape( $type ); ?>" /> <input type="hidden" name="type" value="<?php echo attribute_escape( $type ); ?>" />
<input type="hidden" name="tab" value="<?php echo attribute_escape( $tab ); ?>" /> <input type="hidden" name="tab" value="<?php echo attribute_escape( $tab ); ?>" />
<input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" /> <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
<input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" /> <input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? attribute_escape( $_GET['post_mime_type'] ) : ''; ?>" />
<p id="media-search" class="search-box"> <p id="media-search" class="search-box">
<label class="hidden" for="media-search-input"><?php _e('Search Media');?>:</label> <label class="hidden" for="media-search-input"><?php _e('Search Media');?>:</label>
@ -1715,7 +1717,10 @@ $_num_posts = (array) wp_count_attachments();
$matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts)); $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
foreach ( $matches as $_type => $reals ) foreach ( $matches as $_type => $reals )
foreach ( $reals as $real ) foreach ( $reals as $real )
$num_posts[$_type] += $_num_posts[$real]; if ( isset($num_posts[$_type]) )
$num_posts[$_type] += $_num_posts[$real];
else
$num_posts[$_type] = $_num_posts[$real];
// If available type specified by media button clicked, filter by that type // If available type specified by media button clicked, filter by that type
if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) { if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) {
$_GET['post_mime_type'] = $type; $_GET['post_mime_type'] = $type;
@ -1723,6 +1728,8 @@ if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) {
} }
if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' ) if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' )
$class = ' class="current"'; $class = ' class="current"';
else
$class = '';
$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>"; $type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types')."</a>";
foreach ( $post_mime_types as $mime_type => $label ) { foreach ( $post_mime_types as $mime_type => $label ) {
$class = ''; $class = '';
@ -1730,7 +1737,7 @@ foreach ( $post_mime_types as $mime_type => $label ) {
if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) ) if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
continue; continue;
if ( wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
$class = ' class="current"'; $class = ' class="current"';
$type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>'; $type_links[] = "<li><a href='" . clean_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . "'$class>" . sprintf(_n($label[2][0], $label[2][1], $num_posts[$mime_type]), "<span id='$mime_type-counter'>" . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';

2
wp-admin/media.php
View File

@ -94,7 +94,7 @@ case 'edit' :
<p class="submit"> <p class="submit">
<input type="submit" class="button-primary" name="save" value="<?php _e('Update Media'); ?>" /> <input type="submit" class="button-primary" name="save" value="<?php _e('Update Media'); ?>" />
<input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" /> <input type="hidden" name="post_id" id="post_id" value="<?php echo isset($post_id) ? $post_id : ''; ?>" />
<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo $att_id; ?>" /> <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo $att_id; ?>" />
<input type="hidden" name="action" value="editattachment" /> <input type="hidden" name="action" value="editattachment" />
<?php wp_original_referer_field(true, 'previous'); ?> <?php wp_original_referer_field(true, 'previous'); ?>