Changes from trunk/wp-admin/includes/media.php at r8321 to branches/2.6/wp-admin/includes/media.php at r8607

File:

• branches/2.6/wp-admin/includes/media.php (modified) (15 diffs)

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

@@ -68 +68 @@
 function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
 
-        // CAPTIONS_OFF is temporary. Do not use it.
-        if ( empty($alt) || ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ) return $html;
+        if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html;
         $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
@@ -104 +103 @@
 
         if ( isset($file['error']) )
-                return new wp_error( 'upload_error', $file['error'] );
+                return new WP_Error( 'upload_error', $file['error'] );
 
         $url = $file['url'];
@@ -144 +143 @@
 
         if ( isset($file['error']) )
-                return new wp_error( 'upload_error', $file['error'] );
+                return new WP_Error( 'upload_error', $file['error'] );
 
         $url = $file['url'];
@@ -282 +281 @@
                 $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']) ) {
@@ -511 +510 @@
                 $form_fields['post_title']['required'] = true;
 
-                // CAPTIONS_OFF is temporary. Do not use it.
-                if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
-                        $form_fields['post_excerpt']['label'] = __('Alternate Text');
-                        $form_fields['post_excerpt']['helps'][] = __('Alt text for the image, e.g. "The Mona Lisa"');
-                } else {
-                        $form_fields['post_excerpt']['label'] = __('Caption');
-                        $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
-                }
+                $form_fields['post_excerpt']['label'] = __('Caption');
+                $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
 
                 $form_fields['post_content']['label'] = __('Description');
@@ -607 +600 @@
         $link = get_attachment_link($post->ID);
 
-        // CAPTIONS_OFF is temporary. Do not use it.
-        if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
-                $alt = __('Alternate Text');
-        else
-                $alt = __('Caption');
-
         $form_fields = array(
                 'post_title'   => array(
@@ -619 +606 @@
                 ),
                 'post_excerpt' => array(
-                        'label'      => $alt,
+                        'label'      => __('Caption'),
                         'value'      => $edit_post->post_excerpt,
                 ),
@@ -885 +872 @@
 
 ?>
-<input type='hidden' name='post_id' value='<?php echo (int) $post_id; ?>' />
 <div id="media-upload-notice">
 <?php if (isset($errors['upload_notice']) ) { ?>
@@ -948 +934 @@
 <?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() ): ?>
@@ -1022 +1007 @@
                 if ( f.alt.value ) {
                         alt = f.alt.value.replace(/['"<>]+/g, '');
-<?php if ( ! defined('CAPTIONS_OFF') || true != CAPTIONS_OFF ) { // CAPTIONS_OFF is temporary. Do not use it. ?>
+<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
                         caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 <?php } ?>
@@ -1083 +1068 @@
 </div>
 <input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
+</form>
 <?php
         endif;
@@ -1279 +1265 @@
 
 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>
@@ -1286 +1281 @@
                                 <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>
 
@@ -1296 +1291 @@
                         <td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td>
                 </tr>
-';
-        // CAPTIONS_OFF is temporary. Do not use it.
-        if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
-                $form .= '
+
                 <tr>
                         <th valign="top" scope="row" class="label">
-                                <span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span>
+                                <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 text for the image, e.g. "The Mona Lisa"') . '</p></td>
-                </tr>
-';
-
-        } else {
-                $form .= '
-                <tr>
-                        <th valign="top" scope="row" class="label">
-                                <span class="alignleft"><label for="alt">' . __('Image Caption') . '</label></span>
-                        </th>
-                        <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
-                        <p class="help">' . __('Also used as alternate text for the image') . '</p></td>
-                </tr>
-';
-        }
-                $form .= '
+                        <p class="help">' . $alt_help . '</p></td>
+                </tr>
+
                 <tr class="align">
                         <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
@@ -1355 +1334 @@
 ';
 
-        return $form;
 }