Index: wp-includes/default-filters.php =================================================================== --- wp-includes/default-filters.php (revision 6973) +++ wp-includes/default-filters.php (working copy) @@ -125,6 +125,8 @@ add_filter('list_cats', 'wptexturize'); add_filter('single_post_title', 'wptexturize'); +add_filter('wp_sprintf', 'wp_sprintf_l', 10, 2); + // RSS filters add_filter('the_title_rss', 'strip_tags'); add_filter('the_title_rss', 'ent2ncr', 8); Index: wp-includes/post-template.php =================================================================== --- wp-includes/post-template.php (revision 6973) +++ wp-includes/post-template.php (working copy) @@ -362,8 +362,8 @@ // Attachments // -function the_attachment_link($id = 0, $fullsize = false, $max_dims = false) { - echo get_the_attachment_link($id, $fullsize, $max_dims); +function the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) { + echo get_the_attachment_link($id, $fullsize, $max_dims, $permalink); } function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) { Index: wp-includes/post.php =================================================================== --- wp-includes/post.php (revision 6973) +++ wp-includes/post.php (working copy) @@ -2302,41 +2302,55 @@ */ function wp_mime_type_icon( $mime = 0 ) { $post_id = 0; - if ( is_numeric($mime) ) { - $mime = (int) $mime; - if ( !$post =& get_post( $mime ) ) - return false; - $post_id = (int) $post->ID; - $mime = $post->post_mime_type; - } - if ( empty($mime) ) - return false; + $icon = wp_cache_get('mime_type_icon'); + + if ( empty($icon) ) { + if ( is_numeric($mime) ) { + $mime = (int) $mime; + if ( !$post =& get_post( $mime ) ) + return false; + $post_id = (int) $post->ID; + $mime = $post->post_mime_type; + $ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $post->guid); + } + + $types = array(); + + if ( !empty($ext) ) + $types[] = $ext; + + $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' ); + $icon_dir_uri = apply_filters( 'icon_dir_uri', get_template_directory_uri() . '/images' ); + $image_dir = apply_filters( 'image_dir', ABSPATH . WPINC . '/images' ); + $image_dir_uri = apply_filters( 'image_dir', get_option('siteurl') . '/' . WPINC . '/images' ); + $dirs = array($icon_dir => $icon_dir_uri, $image_dir => $image_dir_uri); + + + if ( ! empty($mime) ) { + $types[] = substr($mime, 0, strpos($mime, '/')); + $types[] = substr($mime, strpos($mime, '/') + 1); + $types[] = str_replace('/', '_', $mime); + } + + $types[] = 'default'; + + $exts = array('png', 'gif', 'jpg'); - $icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' ); - $icon_dir_uri = apply_filters( 'icon_dir_uri', get_template_directory_uri() . '/images' ); - - $types = array( - substr($mime, 0, strpos($mime, '/')), - substr($mime, strpos($mime, '/') + 1), - str_replace('/', '_', $mime) - ); - - $exts = array('jpg', 'gif', 'png'); - - $src = false; - - foreach ( $types as $type ) { - foreach ( $exts as $ext ) { - $src_file = "$icon_dir/$type.$ext"; - if ( file_exists($src_file) ) { - $src = "$icon_dir_uri/$type.$ext"; - break 2; + foreach ( $types as $type ) { + foreach ( $exts as $ext ) { + foreach ( $dirs as $dir => $uri ) { + $src_file = "$dir/$type.$ext"; + if ( file_exists($src_file) ) { + $icon = "$uri/$type.$ext"; + break 3; + } + } } } } - return apply_filters( 'wp_mime_type_icon', $src, $mime, $post_id ); // Last arg is 0 if function pass mime type. + return apply_filters( 'wp_mime_type_icon', $icon, $mime, $post_id ); // Last arg is 0 if function pass mime type. } /** Index: wp-includes/js/swfupload/handlers.js =================================================================== --- wp-includes/js/swfupload/handlers.js (revision 6973) +++ wp-includes/js/swfupload/handlers.js (working copy) @@ -1,5 +1,6 @@ -function uploadLoadedMultimedia() { - jQuery("#html-upload-ui").empty(); +function uploadLoaded() { + jQuery("#html-upload-ui").remove(); + jQuery("#flash-upload-ui").show(); } function fileDialogStart() { @@ -7,7 +8,7 @@ } // progress and success handlers for multimedia multi uploads -function fileQueuedMultimedia(fileObj) { +function fileQueued(fileObj) { // Create a progress bar containing the filename jQuery('#multimedia-items').append('
' + fileObj.name + '
'); @@ -15,12 +16,14 @@ jQuery('#insert-multimedia').attr('disabled', 'disabled'); } -function uploadProgressMultimedia(fileObj, bytesDone, bytesTotal) { +function uploadStart(fileObj) { return true; } + +function uploadProgress(fileObj, bytesDone, bytesTotal) { // Lengthen the progress bar jQuery('#multimedia-item-' + fileObj.id + ' .bar').width(620*bytesDone/bytesTotal); } -function uploadSuccessMultimedia(fileObj, serverData) { +function uploadSuccess(fileObj, serverData) { // if async-upload returned an error message, place it in the multimedia item div and return if ( serverData.match('media-upload-error') ) { jQuery('#multimedia-item-' + fileObj.id).html(serverData); @@ -34,7 +37,7 @@ jQuery('#multimedia-item-' + fileObj.id).append(serverData); // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename - jQuery('#multimedia-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail').prependTo('#multimedia-item-' + fileObj.id); + jQuery('#multimedia-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail toggle').prependTo('#multimedia-item-' + fileObj.id); // Replace the original filename with the new (unique) one assigned during upload jQuery('#multimedia-item-' + fileObj.id + ' .filename.original').replaceWith(jQuery('#multimedia-item-' + fileObj.id + ' .filename.new')); @@ -46,50 +49,24 @@ jQuery('#multimedia-item-' + fileObj.id + ' a.toggle').bind('click', function(){jQuery(this).siblings('.slidetoggle').slideToggle(150);jQuery(this).parent().eq(0).children('.toggle').toggle();jQuery(this).siblings('a.toggle').focus();return false;}); // Bind AJAX to the new Delete button - jQuery('#multimedia-item-' + fileObj.id + ' a.delete').bind('click',function(){jQuery.ajax({url:'admin-ajax.php',type:'post',data:{id:this.id.replace(/[^0-9]/g,''),action:'delete-post',_ajax_nonce:this.href.replace(/^.*wpnonce=/,'')}});jQuery(this).parents(".multimedia-item").eq(0).slideToggle(300, function(){jQuery(this).remove();});return false;}); + jQuery('#multimedia-item-' + fileObj.id + ' a.delete').bind('click',function(){jQuery.ajax({url:'admin-ajax.php',type:'post',data:{id:this.id.replace(/[^0-9]/g,''),action:'delete-post',_ajax_nonce:this.href.replace(/^.*wpnonce=/,'')}});jQuery(this).parents(".multimedia-item").eq(0).slideToggle(300, function(){jQuery(this).remove();if(jQuery('.multimedia-item').length==0)jQuery('.insert-gallery').hide();});return false;}); // Open this item if it says to start open jQuery('#multimedia-item-' + fileObj.id + ' .startopen') .removeClass('startopen') .slideToggle(500) .parent().eq(0).children('.toggle').toggle(); + + jQuery('.insert-gallery').show(); } -function uploadCompleteMultimedia(fileObj) { +function uploadComplete(fileObj) { // If no more uploads queued, enable the submit button if ( swfu.getStats().files_queued == 0 ) jQuery('#insert-multimedia').attr('disabled', ''); } -// progress and success handlers for single image upload - -function uploadLoadedImage() { - jQuery('#image-alt').attr('disabled', true); - jQuery('#image-url').attr('disabled', true); - jQuery('#image-title').attr('disabled', true); - jQuery('#image-add').attr('disabled', true); -} - -function fileQueuedImage(fileObj) { - jQuery('#flash-upload-ui').append('

' + fileObj.name + '

'); -} - -function uploadProgressImage(fileObj, bytesDone, bytesTotal) { - jQuery('#image-progress .bar').width(450*bytesDone/bytesTotal); -} - -function uploadSuccessImage(fileObj, serverData) { - if ( serverData.match('media-upload-error') ) { - jQuery('#media-upload-error').replaceWith(serverData); - jQuery('#image-progress').replaceWith(''); - } - else { - jQuery('#media-upload-error').replaceWith(''); - jQuery('#flash-upload-ui').replaceWith(serverData); - } -} - // wp-specific error handlers // generic message @@ -121,14 +98,6 @@ } } -function fileQueued(fileObj) { - try { - var txtFileName = document.getElementById("txtFileName"); - txtFileName.value = fileObj.name; - } catch (e) { } - -} - function fileDialogComplete(num_files_queued) { try { if (num_files_queued > 0) { @@ -139,171 +108,33 @@ } } -function uploadProgress(fileObj, bytesLoaded, bytesTotal) { - - try { - var percent = Math.ceil((bytesLoaded / bytesTotal) * 100) - - fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file - var progress = new FileProgress(fileObj, this.customSettings.progress_target); - progress.SetProgress(percent); - progress.SetStatus("Uploading..."); - } catch (e) { } -} - -function uploadSuccess(fileObj, server_data) { - try { - fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file - var progress = new FileProgress(fileObj, this.customSettings.progress_target); - progress.SetComplete(); - progress.SetStatus("Complete."); - progress.ToggleCancel(false); - - if (server_data === " ") { - this.customSettings.upload_successful = false; - } else { - this.customSettings.upload_successful = true; - document.getElementById("hidFileID").value = server_data; - } - - } catch (e) { } -} - -function uploadComplete(fileObj) { - try { - if (this.customSettings.upload_successful) { - document.getElementById("btnBrowse").disabled = "true"; - uploadDone(); - } else { - fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file - var progress = new FileProgress(fileObj, this.customSettings.progress_target); - progress.SetError(); - progress.SetStatus("File rejected"); - progress.ToggleCancel(false); - - var txtFileName = document.getElementById("txtFileName"); - txtFileName.value = ""; - //validateForm(); - - alert("There was a problem with the upload.\nThe server did not accept it."); - } - } catch (e) { } -} - function uploadError(fileObj, error_code, message) { - - // first the file specific error - if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) { - wpFileError(fileObj, swfuploadL10n.missing_upload_url); - } - else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED ) { - wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded); - } - else { - wpFileError(fileObj, swfuploadL10n.default_error); - } - - // not sure if this is needed - fileObj.id = "singlefile"; // This makes it so FileProgress only makes a single UI element, instead of one for each file - var progress = new FileProgress(fileObj, this.customSettings.progress_target); - progress.SetError(); - progress.ToggleCancel(false); +alert(message);return; + // first the file specific error + if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) { + wpFileError(fileObj, swfuploadL10n.missing_upload_url); + } + else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED ) { + wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded); + } + else { + wpFileError(fileObj, swfuploadL10n.default_error); + } - // now the general upload status - if ( error_code == SWFUpload.UPLOAD_ERROR.HTTP_ERROR ) { - wpQueueError(swfuploadL10n.http_error); - } - else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED ) { - wpQueueError(swfuploadL10n.upload_failed); - } - else if ( error_code == SWFUpload.UPLOAD_ERROR.IO_ERROR ) { - wpQueueError(swfuploadL10n.io_error); - } - else if ( error_code == SWFUpload.UPLOAD_ERROR.SECURITY_ERROR ) { - wpQueueError(swfuploadL10n.security_error); - } - else if ( error_code == SWFUpload.UPLOAD_ERROR.FILE_CANCELLED ) { - wpQueueError(swfuploadL10n.security_error); - } + // now the general upload status + if ( error_code == SWFUpload.UPLOAD_ERROR.HTTP_ERROR ) { + wpQueueError(swfuploadL10n.http_error); + } + else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED ) { + wpQueueError(swfuploadL10n.upload_failed); + } + else if ( error_code == SWFUpload.UPLOAD_ERROR.IO_ERROR ) { + wpQueueError(swfuploadL10n.io_error); + } + else if ( error_code == SWFUpload.UPLOAD_ERROR.SECURITY_ERROR ) { + wpQueueError(swfuploadL10n.security_error); + } + else if ( error_code == SWFUpload.UPLOAD_ERROR.FILE_CANCELLED ) { + wpQueueError(swfuploadL10n.security_error); + } } - - -/* ******************************************************** - * Utility for displaying the file upload information - * This is not part of SWFUpload, just part of the demo - * ******************************************************** */ -function FileProgress(fileObj, target_id) { - this.file_progress_id = fileObj.id; - - this.fileProgressElement = document.getElementById(this.file_progress_id); - if (!this.fileProgressElement) { - this.fileProgressElement = document.createElement("div"); - this.fileProgressElement.className = "progressContainer"; - this.fileProgressElement.id = this.file_progress_id; - - var progressCancel = document.createElement("a"); - progressCancel.className = "progressCancel"; - progressCancel.href = "#"; - progressCancel.style.visibility = "hidden"; - progressCancel.appendChild(document.createTextNode(" ")); - - var progressText = document.createElement("div"); - progressText.className = "progressName"; - progressText.appendChild(document.createTextNode(fileObj.name)); - - var progressBar = document.createElement("div"); - progressBar.className = "progressBarInProgress"; - - var progressStatus = document.createElement("div"); - progressStatus.className = "progressBarStatus"; - progressStatus.innerHTML = " "; - - this.fileProgressElement.appendChild(progressCancel); - this.fileProgressElement.appendChild(progressText); - this.fileProgressElement.appendChild(progressStatus); - this.fileProgressElement.appendChild(progressBar); - - document.getElementById(target_id).appendChild(this.fileProgressElement); - - } - -} -FileProgress.prototype.SetStart = function() { - this.fileProgressElement.className = "progressContainer"; - this.fileProgressElement.childNodes[3].className = "progressBarInProgress"; - this.fileProgressElement.childNodes[3].style.width = ""; -} - -FileProgress.prototype.SetProgress = function(percentage) { - this.fileProgressElement.className = "progressContainer green"; - this.fileProgressElement.childNodes[3].className = "progressBarInProgress"; - this.fileProgressElement.childNodes[3].style.width = percentage + "%"; -} -FileProgress.prototype.SetComplete = function() { - this.fileProgressElement.className = "progressContainer blue"; - this.fileProgressElement.childNodes[3].className = "progressBarComplete"; - this.fileProgressElement.childNodes[3].style.width = ""; - - -} -FileProgress.prototype.SetError = function() { - this.fileProgressElement.className = "progressContainer red"; - this.fileProgressElement.childNodes[3].className = "progressBarError"; - this.fileProgressElement.childNodes[3].style.width = ""; -} -FileProgress.prototype.SetCancelled = function() { - this.fileProgressElement.className = "progressContainer"; - this.fileProgressElement.childNodes[3].className = "progressBarError"; - this.fileProgressElement.childNodes[3].style.width = ""; -} -FileProgress.prototype.SetStatus = function(status) { - this.fileProgressElement.childNodes[2].innerHTML = status; -} - -FileProgress.prototype.ToggleCancel = function(show, upload_obj) { - this.fileProgressElement.childNodes[0].style.visibility = show ? "visible" : "hidden"; - if (upload_obj) { - var file_id = this.file_progress_id; - this.fileProgressElement.childNodes[0].onclick = function() { upload_obj.cancelUpload(file_id); return false; }; - } -} Index: wp-includes/media.php =================================================================== --- wp-includes/media.php (revision 6973) +++ wp-includes/media.php (working copy) @@ -85,7 +85,7 @@ list( $img_src, $width, $height ) = image_downsize($id, $size); $hwstring = image_hwstring($width, $height); - $html = ''.attribute_escape($alt).''; + $html = ''.attribute_escape($alt).''; $html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url ); Index: wp-includes/formatting.php =================================================================== --- wp-includes/formatting.php (revision 6973) +++ wp-includes/formatting.php (working copy) @@ -1277,4 +1277,97 @@ return $matches[0]; } +/** + * wp_sprintf() - sprintf() with filters + */ +function wp_sprintf( $pattern ) { + $args = func_get_args( ); + $len = strlen($pattern); + $start = 0; + $result = ''; + $arg_index = 0; + while ( $len > $start ) { + // Last character: append and break + if ( strlen($pattern) - 1 == $start ) { + $result .= substr($pattern, -1); + break; + } + + // Literal %: append and continue + if ( substr($pattern, $start, 2) == '%%' ) { + $start += 2; + $result .= '%'; + continue; + } + + // Get fragment before next % + $end = strpos($pattern, '%', $start + 1); + if ( false === $end ) + $end = $len; + $fragment = substr($pattern, $start, $end - $start); + + // Fragment has a specifier + if ( $pattern{$start} == '%' ) { + // Find numbered arguments or take the next one in order + if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) { + $arg = isset($args[$matches[1]]) ? $args[$matches[1]] : ''; + $fragment = str_replace("%{$matches[1]}$", '%', $fragment); + } else { + ++$arg_index; + $arg = isset($args[$arg_index]) ? $args[$arg_index] : ''; + } + + // Apply filters OR sprintf + $_fragment = apply_filters( 'wp_sprintf', $fragment, $arg ); + if ( $_fragment != $fragment ) + $fragment = $_fragment; + else + $fragment = sprintf($fragment, strval($arg) ); + } + + // Append to result and move to next fragment + $result .= $fragment; + $start = $end; + } + return $result; +} + +/** + * wp_sprintf_l - List specifier %l for wp_sprintf + * + * @param unknown_type $pattern + * @param unknown_type $args + * @return unknown + */ +function wp_sprintf_l($pattern, $args) { + // Not a match + if ( substr($pattern, 0, 2) != '%l' ) + return $pattern; + + // Nothing to work with + if ( empty($args) ) + return ''; + + // Translate and filter the delimiter set (avoid ampersands and entities here) + $l = apply_filters('wp_sprintf_l', array( + 'between' => _c(', |between list items'), + 'between_last_two' => _c(', and |between last two list items'), + 'between_only_two' => _c(' and |between only two list items'), + )); + + $args = (array) $args; + $result = array_shift($args); + if ( count($args) == 1 ) + $result .= $l['between_two'] . array_shift($args); + // Loop when more than two args + while ( count($args) ) { + $arg = array_shift($args); + if ( $i == 1 ) + $result .= $l['between_last_two'] . $arg; + else + $result .= $l['between'] . $arg; + } + return $result . substr($pattern, 2); +} + ?> Index: wp-includes/images/swf.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/swf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/audio.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/audio.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/zip.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/zip.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/html.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/html.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/doc.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/doc.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/video.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/video.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/pdf.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/pdf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/js.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/js.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/exe.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/exe.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/text.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/text.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/default.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/default.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/tar.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/tar.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/images/css.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: wp-includes/images/css.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: wp-includes/general-template.php =================================================================== --- wp-includes/general-template.php (revision 6973) +++ wp-includes/general-template.php (working copy) @@ -941,8 +941,7 @@ if ( $media_buttons ) { ?>
- - +
Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 6973) +++ wp-includes/script-loader.php (working copy) @@ -94,7 +94,7 @@ $this->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.0.2'); $this->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.0.2'); $this->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.0.2'); - $this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080216'); + $this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080220'); // these error messages came from the sample swfupload js, they might need changing. $this->localize( 'swfupload-handlers', 'swfuploadL10n', array( 'queue_limit_exceeded' => 'You have attempted to queue too many files.', Index: wp-admin/includes/media.php =================================================================== --- wp-admin/includes/media.php (revision 6973) +++ wp-admin/includes/media.php (working copy) @@ -35,198 +35,6 @@ } } -function image_upload_callback() { - $tabs = image_upload_tabs(); - if ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) && is_callable($_GET['tab']) ) - return $_GET['tab'](); - elseif ( is_callable($first = array_shift(array_keys($tabs))) ) - return $first(); - else - return image_upload_handler(); -} - -add_action('media_upload_image', 'image_upload_callback'); - -function image_upload_form( $action_url, $values = array(), $error = null ) { - $action_url = attribute_escape( $action_url ); - $image_alt = attribute_escape( @$values['image-alt'] ); - $image_url = attribute_escape( @$values['image-url'] ); - $image_title = attribute_escape( @$values['image-title'] ); - $image_align = @$values['image-url']; - $post_id = $_GET['post_id']; - -?> -
-

- -
-
-get_error_message(); -} ?> -
- -
-

- - -

-

- -

-

- -

-

- -

-

- -

-
- - /> - - /> - - /> - - /> - -
-
- - /> - - /> - - /> - -
-

- - -

- - -
- $id, - 'post_title' => $_POST['image-title'], - 'post_content' => $_POST['image-alt'], - )); - } - else { - $id = image_upload_post(); - } - - // if the input was invalid, redisplay the form with its current values - if ( is_wp_error($id) ) - wp_iframe( 'image_upload_form', get_option('siteurl') . '/wp-admin/media-upload.php?type=image', $_POST, $id ); - else { - media_send_to_editor(get_image_send_to_editor($id, $_POST['image-alt'], $_POST['image-title'], $_POST['image-align'], $_POST['image-url'], true, $_POST['image-size'])); - } - } -} - -// this returns html to include in the single image upload form when the async flash upload has finished -// i.e. show a thumb of the image, and include the attachment id as a hidden input -function async_image_callback($id) { - $thumb_url = wp_get_attachment_thumb_url($id); - if ( empty($thumb_url) ) - $thumb_url = wp_mime_type_icon($id); - - if ($thumb_url) { - $out = '

' - . ' ' - . basename(wp_get_attachment_url($id)).'

'; - } - else { - $out = '

' - . basename(wp_get_attachment_url($id)).'

'; - } - - $post = get_post($id); - $title = addslashes($post->post_title); - $alt = addslashes($post->post_content); - - // populate the input fields with post data (which in turn comes from exif/iptc) - $out .= << - - -EOF; - - return $out; -} - -add_filter('async_upload_image', 'async_image_callback'); - - function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') { $html = get_image_tag($id, $alt, $title, $align, $rel, $size); @@ -254,45 +62,6 @@ exit; } -// this handles the file upload POST itself, validating input and inserting the file if it's valid -function image_upload_post() { - if ( empty($_FILES['image-file']['name']) ) - return new wp_error( 'image_file_required', __('Please choose an image file to upload') ); - if ( empty($_POST['image-alt']) ) - return new wp_error( 'image_alt_required', __('Please enter an <alt> description') ); - - $overrides = array('test_form'=>false); - $file = wp_handle_upload($_FILES['image-file'], $overrides); - - if ( isset($file['error']) ) - return new wp_error( 'upload_error', $file['error'] ); - - $url = $file['url']; - $type = $file['type']; - $file = $file['file']; - - $post_title = trim($_POST['image-title']); - $post_content = trim($_POST['image-alt']); - $post_parent = intval($_POST['parent_post_id']); - - // Construct the attachment array - $attachment = array( - 'post_title' => $post_title, - 'post_content' => $post_content, - 'post_type' => 'attachment', - 'post_parent' => $post_parent, - 'post_mime_type' => $type, - 'guid' => $url - ); - - // Save the data - $id = wp_insert_attachment($attachment, $file, $post_parent); - if ( !is_wp_error($id) ) - wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); - - return $id; -} - // this handles the file upload POST itself, creating the attachment post function media_handle_upload($file_id, $post_id, $post_data = array()) { $overrides = array('test_form'=>false); @@ -371,24 +140,12 @@ - - - - - - -EOF; - echo $out; + echo "" . __('Add media'). ''; } add_action( 'media_buttons', 'media_buttons' ); @@ -522,12 +279,13 @@ function image_attachment_fields_to_edit($form_fields, $post) { if ( substr($post->post_mime_type, 0, 5) == 'image' ) { $form_fields['post_title']['required'] = true; - $form_fields['post_excerpt']['label'] = __('Alternate Text'); - $form_fields['post_content']['label'] = __('Description'); + $form_fields['post_excerpt']['label'] = __('Description'); + $form_fields['post_excerpt']['helps'][] = __('Alternate text, e.g. "The Mona Lisa"'); - if ( strlen(trim($post->post_excerpt)) == 0 ) - $form_fields['post_excerpt']['helps'][] = __('Alternate Text helps people who can not see the image.'); + $form_fields['post_content']['label'] = __('Long Description'); + $thumb = wp_get_attachment_thumb_url(); + $form_fields['_send']['url'] = array( 'label' => __('Link URL'), 'input' => 'html', @@ -547,6 +305,17 @@ \n", ); + $form_fields['_send']['image-size'] = array( + 'label' => __('Size'), + 'input' => 'html', + 'html' => " + " . ( $thumb ? " + + " : '' ) . " + + + ", + ); } return $form_fields; } @@ -581,7 +350,12 @@ else $align = 'none'; - return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel); + if ( !empty($attachment['image-size']) ) + $size = $attachment['image-size']; + else + $size = 'medium'; + + return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size); } return $html; @@ -603,11 +377,11 @@ 'value' => $edit_post->post_title, ), 'post_excerpt' => array( - 'label' => __('Excerpt'), + 'label' => __('Description'), 'value' => $edit_post->post_excerpt, ), 'post_content' => array( - 'label' => __('Description'), + 'label' => __('Long description'), 'value' => $edit_post->post_content, 'input' => 'textarea', 'helps' => array(__('If filled, the default link URL will be the attachment permalink.')), @@ -637,25 +411,21 @@ // Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing ) $form_fields = array_merge_recursive($form_fields, (array) $errors); - + $form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post); return $form_fields; } function get_multimedia_item( $attachment_id, $errors = null, $send = true ) { - $thumb_url = wp_get_attachment_thumb_url( $attachment_id ); - if ( empty($thumb_url) ) - $thumb_url = wp_mime_type_icon( $attachment_id ); - if ( empty($thumb_url) && ( $post =& get_post( $attachment_id ) ) && substr($post->post_mime_type, 0, 5) == 'image' ) - $thumb_url = wp_get_attachment_url( $attachment_id ); + $thumb_url = array_shift(get_attachment_icon_src( $attachment_id )); $title_label = __('Title'); $description_label = __('Description'); $tags_label = __('Tags'); - $toggle_on = __('Describe'); - $toggle_off = __('Describe «'); + $toggle_on = __('Show'); + $toggle_off = __('Hide'); $post = get_post($attachment_id); @@ -697,12 +467,12 @@ $send = ""; if ( empty($form_fields['save']) && empty($form_fields['_send']) ) { - $form_fields['save'] = array('tr' => "\t\t$delete$save$send\n"); + $form_fields['save'] = array('tr' => "\t\t$delete$save$send\n"); } elseif ( empty($form_fields['save']) ) { $form_fields['save'] = array('tr' => "\t\t$save\n"); foreach ( $form_fields['_send'] as $id => $field ) $form_fields[$id] = $field; - $form_fields['send'] = array('tr' => "\t\t$delete$send"); + $form_fields['send'] = array('tr' => "\t\t$delete$send"); } $hidden_fields = array(); @@ -773,13 +543,15 @@ ?>
-

+

+
-
+ +
get_error_message(); ?> -
+
-
+
+

+

+
+

@@ -838,8 +610,6 @@

- -
@@ -847,8 +617,7 @@

- - +

@@ -862,20 +631,30 @@ add_filter('async_upload_multimedia', 'get_multimedia_item', 10, 2); add_filter('media_upload_multimedia', 'multimedia_upload_handler'); + // Any 'attachment' taxonomy will be included in the description input form for the multi uploader // Example: +/* register_taxonomy( - // 'image_people', 'attachment:image', array( 'label' => __('People'), - 'template' => __('People: %s'), + 'template' => __('People: %l'), + 'helps' => __('Left to right, top to bottom.'), 'sort' => true, 'args' => array( 'orderby' => 'term_order' ) ) ); +*/ +/* +register_taxonomy('movie_director', 'attachment:video', array('label'=>__('Directors'), 'template'=>__('Directed by %l.'))); +register_taxonomy('movie_producer', 'attachment:video', array('label'=>__('Producers'), 'template'=>__('Produced by %l.'))); +register_taxonomy('movie_screenwriter', 'attachment:video', array('label'=>__('Screenwriter'), 'template'=>__('Screenplay by %l.'))); +register_taxonomy('movie_actor', 'attachment:video', array('label'=>__('Cast'), 'template'=>array(__('Cast: %l.'))); +register_taxonomy('movie_crew', 'attachment:video', array('label'=>__('Crew'), 'template'=>array(__('Crew: %l.'))); +*/ ?> Index: wp-admin/edit-attachment-rows.php =================================================================== --- wp-admin/edit-attachment-rows.php (revision 6973) +++ wp-admin/edit-attachment-rows.php (working copy) @@ -46,16 +46,17 @@ case 'media': ?> - +
+ guid)); ?> + ID); ?> + - + post_excerpt : ''; ?> - +