WordPress.org

Make WordPress Core

Ticket #6812: img_captions7.patch

File img_captions7.patch, 11.5 KB (added by azaozz, 7 years ago)
  • wp-admin/gears-manifest.php

     
    6464?> 
    6565{ 
    6666"betaManifestVersion" : 1, 
    67 "version" : "<?php echo $man_version; ?>_20080710a", 
     67"version" : "<?php echo $man_version; ?>_20080712", 
    6868"entries" : [ 
    6969<?php echo $defaults; ?> 
    7070 
     
    131131{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311" }, 
    132132{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" }, 
    133133{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" }, 
    134 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311d" }, 
     134{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311e" }, 
    135135{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" }, 
    136136{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" }, 
    137137{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311" }, 
     
    148148{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311" }, 
    149149{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" }, 
    150150{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" }, 
    151 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311d" }, 
     151{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311e" }, 
    152152{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" }, 
    153153 
    154154{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311" }, 
     
    161161{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311" }, 
    162162{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" }, 
    163163{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" }, 
    164 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311d" }, 
     164{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311e" }, 
    165165{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" }, 
    166166{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" }, 
    167167 
  • wp-admin/includes/media.php

     
    6767 
    6868function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) { 
    6969 
    70         // CAPTIONS_OFF is temporary. Do not use it. 
    71         if ( empty($alt) || ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ) return $html; 
     70        if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html; 
    7271        $id = ( 0 < (int) $id ) ? 'attachment_' . $id : ''; 
    7372 
    7473        preg_match( '/width="([0-9]+)/', $html, $matches ); 
     
    510509        if ( substr($post->post_mime_type, 0, 5) == 'image' ) { 
    511510                $form_fields['post_title']['required'] = true; 
    512511 
    513                 // CAPTIONS_OFF is temporary. Do not use it. 
    514                 if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) { 
    515                         $form_fields['post_excerpt']['label'] = __('Alternate Text'); 
    516                         $form_fields['post_excerpt']['helps'][] = __('Alt text for the image, e.g. "The Mona Lisa"'); 
    517                 } else { 
    518                         $form_fields['post_excerpt']['label'] = __('Caption'); 
    519                         $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image'); 
    520                 } 
     512                $form_fields['post_excerpt']['label'] = __('Caption'); 
     513                $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image'); 
    521514 
    522515                $form_fields['post_content']['label'] = __('Description'); 
    523516 
     
    606599        $file = wp_get_attachment_url($post->ID); 
    607600        $link = get_attachment_link($post->ID); 
    608601 
    609         // CAPTIONS_OFF is temporary. Do not use it. 
    610         if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) 
    611                 $alt = __('Alternate Text'); 
    612         else 
    613                 $alt = __('Caption'); 
    614  
    615602        $form_fields = array( 
    616603                'post_title'   => array( 
    617604                        'label'      => __('Title'), 
    618605                        'value'      => $edit_post->post_title, 
    619606                ), 
    620607                'post_excerpt' => array( 
    621                         'label'      => $alt, 
     608                        'label'      => __('Caption'), 
    622609                        'value'      => $edit_post->post_excerpt, 
    623610                ), 
    624611                'post_content' => array( 
     
    10211008 
    10221009                if ( f.alt.value ) { 
    10231010                        alt = f.alt.value.replace(/['"<>]+/g, ''); 
    1024 <?php if ( ! defined('CAPTIONS_OFF') || true != CAPTIONS_OFF ) { // CAPTIONS_OFF is temporary. Do not use it. ?> 
     1011<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?> 
    10251012                        caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;'); 
    10261013<?php } ?> 
    10271014                } 
     
    12781265} 
    12791266 
    12801267function type_form_image() { 
    1281         $form = ' 
     1268 
     1269        if ( apply_filters( 'disable_captions', '' ) ) { 
     1270                $alt = __('Alternate Text'); 
     1271                $alt_help = __('Alt text for the image, e.g. "The Mona Lisa"'); 
     1272        } else { 
     1273                $alt = __('Image Caption'); 
     1274                $alt_help = __('Also used as alternate text for the image'); 
     1275        } 
     1276         
     1277        return ' 
    12821278        <table class="describe"><tbody> 
    12831279                <tr> 
    12841280                        <th valign="top" scope="row" class="label" style="width:120px;"> 
     
    12951291                        </th> 
    12961292                        <td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td> 
    12971293                </tr> 
    1298 '; 
    1299         // CAPTIONS_OFF is temporary. Do not use it. 
    1300         if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) { 
    1301                 $form .= ' 
    1302                 <tr> 
    1303                         <th valign="top" scope="row" class="label"> 
    1304                                 <span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span> 
    1305                         </th> 
    1306                         <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" /> 
    1307                         <p class="help">' . __('Alt text for the image, e.g. "The Mona Lisa"') . '</p></td> 
    1308                 </tr> 
    1309 '; 
    13101294 
    1311         } else { 
    1312                 $form .= ' 
    13131295                <tr> 
    13141296                        <th valign="top" scope="row" class="label"> 
    1315                                 <span class="alignleft"><label for="alt">' . __('Image Caption') . '</label></span> 
     1297                                <span class="alignleft"><label for="alt">' . $alt . '</label></span> 
    13161298                        </th> 
    13171299                        <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" /> 
    1318                         <p class="help">' . __('Also used as alternate text for the image') . '</p></td> 
     1300                        <p class="help">' . $alt_help . '</p></td> 
    13191301                </tr> 
    1320 '; 
    1321         } 
    1322                 $form .= ' 
     1302 
    13231303                <tr class="align"> 
    13241304                        <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th> 
    13251305                        <td class="field"> 
     
    13541334        </tbody></table> 
    13551335'; 
    13561336 
    1357         return $form; 
    13581337} 
    13591338 
    13601339function type_form_audio() { 
     
    14981477 
    14991478add_filter('media_upload_library', 'media_upload_library'); 
    15001479 
    1501 ?> 
     1480?> 
     1481 No newline at end of file 
  • wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

     
    44<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 
    55<title></title> 
    66 
    7 <script type="text/javascript" src="js/editimage.js?ver=311d"></script> 
     7<script type="text/javascript" src="js/editimage.js?ver=311e"></script> 
    88<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script> 
    99 
    10 <link rel="stylesheet" href="css/editimage.css?ver=311d" type="text/css" media="all" /> 
    11 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta3" type="text/css" media="all" /> 
     10<link rel="stylesheet" href="css/editimage.css?ver=311e" type="text/css" media="all" /> 
     11<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6" type="text/css" media="all" /> 
    1212<script type="text/javascript"> 
    1313if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') ) 
    1414        document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=311" type="text/css" media="all" />'); 
  • wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

     
    1515                                if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' ) 
    1616                                        return; 
    1717 
    18                                 tb_show('', url + '/editimage.html?ver=311c&TB_iframe=true'); 
     18                                tb_show('', url + '/editimage.html?ver=311e&TB_iframe=true'); 
    1919                                tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); 
    2020                        }); 
    2121 
  • wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

     
    248248                var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = null; 
    249249                document.dir = tinyMCEPopup.editor.getParam('directionality',''); 
    250250 
    251                 if ( ! tinyMCEPopup.editor.getParam('wpeditimage_do_captions', true) ) 
     251                if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) ) 
    252252                        t.I('cap_field').style.display = 'none'; 
    253253 
    254254                tinyMCEPopup.restoreSelection(); 
  • wp-includes/js/tinymce/tiny_mce_config.php

     
    130130$mce_buttons_4 = apply_filters('mce_buttons_4', array()); 
    131131$mce_buttons_4 = implode($mce_buttons_4, ','); 
    132132 
    133 $do_captions = ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ? false : true; 
     133$no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false; 
    134134 
    135135// TinyMCE init settings 
    136136$initArray = array ( 
     
    165165        'tab_focus' => ':next', 
    166166        'content_css' => "$mce_css", 
    167167        'save_callback' => 'switchEditors.saveCallback', 
    168         'wpeditimage_do_captions' => $do_captions, 
     168        'wpeditimage_disable_captions' => $no_captions, 
    169169        'plugins' => "$plugins", 
    170170        // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init" 
    171171        'disk_cache' => true, 
     
    225225// Setup cache info 
    226226if ( $disk_cache ) { 
    227227 
    228         $cacheKey = apply_filters('tiny_mce_version', '20080710'); 
     228        $cacheKey = apply_filters('tiny_mce_version', '20080712'); 
    229229 
    230230        foreach ( $initArray as $v ) 
    231231                $cacheKey .= $v; 
  • wp-includes/media.php

     
    355355 
    356356function img_caption_shortcode($attr, $content = null) { 
    357357 
    358         if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) 
    359                 return $content; 
    360  
    361358        // Allow plugins/themes to override the default caption template. 
    362359        $output = apply_filters('img_caption_shortcode', '', $attr, $content); 
    363360        if ( $output != '' ) 
  • wp-includes/script-loader.php

     
    3737        $scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080710' ); 
    3838 
    3939        // Modify this version when tinyMCE plugins are changed. 
    40         $mce_version = apply_filters('tiny_mce_version', '20080710'); 
     40        $mce_version = apply_filters('tiny_mce_version', '20080712'); 
    4141        $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version ); 
    4242 
    4343        $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');