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

Timestamp:

08/11/2008 10:52:43 PM (17 years ago)

Author:

ryan

Message:

crazyhorse: merge with log:trunk@8334:8619 , merge arrows unresolved

File:

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

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

@@ -68 +68 @@
 function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
 
+<<<<<<< .working
     if ( empty($alt) ) return $html;
+=======
+    if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html;
+>>>>>>> .merge-right.r8619
     $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
@@ -103 +107 @@
 
     if ( isset($file['error']) )
-        return new wp_error( 'upload_error', $file['error'] );
+        return new WP_Error( 'upload_error', $file['error'] );
 
     $url = $file['url'];
@@ -143 +147 @@
 
     if ( isset($file['error']) )
-        return new wp_error( 'upload_error', $file['error'] );
+        return new WP_Error( 'upload_error', $file['error'] );
 
     $url = $file['url'];
@@ -281 +285 @@
         $keys = array_keys($_POST['send']);
         $send_id = (int) array_shift($keys);
-        $attachment = $_POST['attachments'][$send_id];
+        $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
         $html = $attachment['post_title'];
         if ( !empty($attachment['url']) ) {
@@ -297 +301 @@
 // crazyhorse
 function media_upload_image() {
-
+<<<<<<< .working
+
+=======
+    $errors = array();
+    $id = 0;
+
+>>>>>>> .merge-right.r8619
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -365 +375 @@
 
 function media_upload_audio() {
+    $errors = array();
+    $id = 0;
+
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -405 +418 @@
 
 function media_upload_video() {
+    $errors = array();
+    $id = 0;
+
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -445 +461 @@
 
 function media_upload_file() {
+    $errors = array();
+    $id = 0;
+
     if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
         // Upload File button was clicked
@@ -485 +504 @@
 
 function media_upload_gallery() {
+    $errors = array();
+
     if ( !empty($_POST) ) {
         $return = media_upload_form_handler();
@@ -499 +520 @@
 
 function media_upload_library() {
+    $errors = array();
     if ( !empty($_POST) ) {
         $return = media_upload_form_handler();
@@ -511 +533 @@
 }
 
+<<<<<<< .working
 // crazyhorse
+=======
+function image_size_input_fields($post, $checked='') {
+        
+        // get a list of the actual pixel dimensions of each possible intermediate version of this image
+        $sizes = array();
+        $size_names = array('thumbnail' => 'Thumbnail', 'medium' => 'Medium', 'large' => 'Large', 'full' => 'Full size');
+        
+        foreach ( $size_names as $size => $name) {
+            $downsize = image_downsize($post->ID, $size);
+            
+            // is this size selectable?
+            $enabled = ( $downsize[3] || 'full' == $size );
+            $css_id = "image-size-{$size}-{$post->ID}";
+            // if $checked was not specified, default to the first available size that's bigger than a thumbnail
+            if ( !$checked && $enabled && 'thumbnail' != $size )
+                $checked = $size;
+            
+            $html = "<div class='image-size-item'><input type='radio' ".( $enabled ? '' : "disabled='disabled'")."name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'".( $checked == $size ? " checked='checked'" : '') ." />";
+            
+            $html .= "<label for='{$css_id}'>" . __($name). "</label>";
+            // only show the dimensions if that choice is available
+            if ( $enabled )
+                $html .= " <label for='{$css_id}' class='help'>" . sprintf( __("(%d&nbsp;&times;&nbsp;%d)"), $downsize[1], $downsize[2] ). "</label>";
+                
+            $html .= '</div>';
+        
+            $out[] = $html;
+        }
+        
+        return array(
+            'label' => __('Size'),
+            'input' => 'html',
+            'html'  => join("\n", $out),
+        );
+}
+
+>>>>>>> .merge-right.r8619
 function image_attachment_fields_to_edit($form_fields, $post) {
     if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
         $form_fields['post_title']['required'] = true;
 
+<<<<<<< .working
         $form_fields['post_excerpt']['label'] = __('Caption');
         $form_fields['post_excerpt']['helps'][] = __('Alternate text (e.g. Blue skies)');
+=======
+        $form_fields['post_excerpt']['label'] = __('Caption');
+        $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
+>>>>>>> .merge-right.r8619
 
 //      $form_fields['post_content']['label'] = __('Description');
 
+<<<<<<< .working
 //      $thumb = wp_get_attachment_thumb_url($post->ID);
 
+=======
+>>>>>>> .merge-right.r8619
         $form_fields['align'] = array(
             'label' => __('Alignment'),
@@ -536 +604 @@
                 <label for='image-align-right-$post->ID' class='align image-align-right-label'>" . __('Right') . "</label>\n",
         );
+<<<<<<< .working
 /*
         $form_fields['image-size'] = array(
@@ -548 +617 @@
                 <label for='image-size-full-$post->ID'>" . __('Full size') . "</label>",
         );
+=======
+        $form_fields['image-size'] = image_size_input_fields($post);
+>>>>>>> .merge-right.r8619
 */
     }
@@ -615 +687 @@
         ),
         'post_excerpt' => array(
+<<<<<<< .working
             'label'      => __('Caption'),
             'value'      => $edit_post->post_excerpt
+=======
+            'label'      => __('Caption'),
+            'value'      => $edit_post->post_excerpt,
+>>>>>>> .merge-right.r8619
         ),
 /*
@@ -1066 +1143 @@
 
 ?>
-<input type='hidden' name='post_id' value='<?php echo (int) $post_id; ?>' />
 <div id="media-upload-notice">
 <?php if (isset($errors['upload_notice']) ) { ?>
@@ -1129 +1205 @@
 <?php do_action('pre-html-upload-ui'); ?>
     <p>
-    <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onClick="return top.tb_remove();"><?php _e('Cancel'); ?></a>
+    <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onclick="return top.tb_remove();"><?php _e('Cancel'); ?></a>
     </p>
-    <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
+
     <br class="clear" />
     <?php if ( is_lighttpd_before_150() ): ?>
@@ -1203 +1279 @@
         if ( f.alt.value ) {
             alt = f.alt.value.replace(/['"<>]+/g, '');
+<<<<<<< .working
+=======
+<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
+>>>>>>> .merge-right.r8619
             caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
         }
@@ -1262 +1342 @@
 </div>
 <input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+</form>
 <?php
     endif;
@@ -1321 +1402 @@
     $form_action_url = admin_url("media-upload.php?type=single&tab=library&post_id=$post_id");
 
-    $_GET['paged'] = intval($_GET['paged']);
+    $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0;
     if ( $_GET['paged'] < 1 )
         $_GET['paged'] = 1;
@@ -1382 +1463 @@
 
 function type_form_image() {
-    $form = '
+
+    if ( apply_filters( 'disable_captions', '' ) ) {
+        $alt = __('Alternate Text');
+        $alt_help = __('Alt text for the image, e.g. "The Mona Lisa"');
+    } else {
+        $alt = __('Image Caption');
+        $alt_help = __('Also used as alternate text for the image');
+    }
+
+    return '
     <table class="describe"><tbody>
         <tr>
@@ -1389 +1479 @@
                 <span class="alignright"><img id="status_img" src="images/required.gif" title="required" alt="required" /></span>
             </th>
-            <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()"></td>
+            <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
         </tr>
 
@@ -1399 +1489 @@
             <td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td>
         </tr>
-
+<<<<<<< .working
+=======
+
+        <tr>
+            <th valign="top" scope="row" class="label">
+                <span class="alignleft"><label for="alt">' . $alt . '</label></span>
+            </th>
+            <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
+            <p class="help">' . $alt_help . '</p></td>
+        </tr>
+>>>>>>> .merge-right.r8619
+
+<<<<<<< .working
         <tr>
             <th valign="top" scope="row" class="label">
@@ -1408 +1510 @@
         </tr>
 
+=======
+>>>>>>> .merge-right.r8619
         <tr class="align">
             <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
@@ -1442 +1546 @@
 ';
 
-    return $form;
 }