WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Location:
branches/2.6
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/2.6/wp-admin/css/ie-rtl.css

    r8582 r8621  
    5252    text-align: left;
    5353}
     54
     55/* IE6 */
     56
     57/* Search box gets stuck to the right, hidden outside view */
     58* html #post-search, * html #widget-search {
     59    height: 1% !important;
     60    right: 600px !important;
     61}
     62
     63/* Sidemenu tends to disapear, widget filter area tends to jump around when adding filters - Peek-A-Boo! */
     64* html #sidemenu, * html #widgets-filter {
     65    height: 1% !important;
     66}
     67
     68/* Media upload window gets stuck to the right, hidden outside view */
     69* html #TB_window {
     70    left: 100px !important;
     71}
     72
     73/* Bad floating in the sub-sub-sub menu makes links un-clickable */
     74* html .subsubsub li {
     75    display: block; float: right; margin: 0 2px;
     76}
     77
     78/* Fixing floats on sub-sub-sub menu skewes the view-switch menu on comments management page */
     79* html .wrap .view-switch {
     80    margin-top: 1px;
     81}
     82
     83/* Theme selector on theme edit page gets stuck to the left, hidden outside view */
     84* html #themeselector {
     85    position: static;
     86}
     87
     88/* Template edit area floats beneath template list, gets RTLed */
     89* html #template {
     90    float: right;
     91    overflow: hidden;
     92    width: 755px !important;
     93}
     94* html #template #newcontent {
     95    direction: ltr;
     96}
     97
     98/* Editor */
     99
     100.mceToolbar {
     101    direction: ltr;
     102    text-align: left;
     103}

  • branches/2.6/wp-admin/gears-manifest.php

    r8582 r8621  
    6565{
    6666"betaManifestVersion" : 1,
    67 "version" : "<?php echo $man_version; ?>_20080731",
     67"version" : "<?php echo $man_version; ?>_20080810",
    6868"entries" : [
    6969<?php echo $defaults; ?>
    … …  
    104104{ "url" : "images/yes.png" },
    105105
    106 { "url" : "../wp-includes/images/crystal/archive.png" },
    107 { "url" : "../wp-includes/images/crystal/audio.png" },
    108 { "url" : "../wp-includes/images/crystal/code.png" },
    109 { "url" : "../wp-includes/images/crystal/default.png" },
    110 { "url" : "../wp-includes/images/crystal/document.png" },
    111 { "url" : "../wp-includes/images/crystal/interactive.png" },
    112 { "url" : "../wp-includes/images/crystal/text.png" },
    113 { "url" : "../wp-includes/images/crystal/video.png" },
    114 { "url" : "../wp-includes/images/crystal/spreadsheet.png" },
    115 { "url" : "../wp-includes/images/rss.png" },
    116 { "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
    117 { "url" : "../wp-includes/js/thickbox/tb-close.png" },
    118 { "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
    119 
     106<?php if ( is_file(ABSPATH.'/wp-includes/js/tinymce/tiny_mce.js') ) { ?>
    120107{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" },
    121108{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" },
    … …  
    132119{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
    133120{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
    134 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311f" },
     121{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" },
    135122{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
    136123{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
    … …  
    149136{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
    150137{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
    151 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311f" },
     138{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" },
    152139{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
    153140
    … …  
    162149{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
    163150{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
    164 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311f" },
     151{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" },
    165152{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
    166153{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
    … …  
    204191{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" },
    205192{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" },
    206 { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" }
     193{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" },
     194<?php } ?>
     195
     196{ "url" : "../wp-includes/images/crystal/archive.png" },
     197{ "url" : "../wp-includes/images/crystal/audio.png" },
     198{ "url" : "../wp-includes/images/crystal/code.png" },
     199{ "url" : "../wp-includes/images/crystal/default.png" },
     200{ "url" : "../wp-includes/images/crystal/document.png" },
     201{ "url" : "../wp-includes/images/crystal/interactive.png" },
     202{ "url" : "../wp-includes/images/crystal/text.png" },
     203{ "url" : "../wp-includes/images/crystal/video.png" },
     204{ "url" : "../wp-includes/images/crystal/spreadsheet.png" },
     205{ "url" : "../wp-includes/images/rss.png" },
     206{ "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
     207{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
     208{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" }
    207209]}

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

    r8582 r8621  
    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
    … …  
    282281        $keys = array_keys($_POST['send']);
    283282        $send_id = (int) array_shift($keys);
    284         $attachment = $_POST['attachments'][$send_id];
     283        $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
    285284        $html = $attachment['post_title'];
    286285        if ( !empty($attachment['url']) ) {
    … …  
    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');
    … …  
    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(
    … …  
    619606        ),
    620607        'post_excerpt' => array(
    621             'label'      => $alt,
     608            'label'      => __('Caption'),
    622609            'value'      => $edit_post->post_excerpt,
    623610        ),
    … …  
    10201007        if ( f.alt.value ) {
    10211008            alt = f.alt.value.replace(/['"<>]+/g, '');
    1022 <?php if ( ! defined('CAPTIONS_OFF') || true != CAPTIONS_OFF ) { // CAPTIONS_OFF is temporary. Do not use it. ?>
     1009<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
    10231010            caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
    10241011<?php } ?>
    … …  
    12781265
    12791266function type_form_image() {
    1280     $form = '
     1267
     1268    if ( apply_filters( 'disable_captions', '' ) ) {
     1269        $alt = __('Alternate Text');
     1270        $alt_help = __('Alt text for the image, e.g. "The Mona Lisa"');
     1271    } else {
     1272        $alt = __('Image Caption');
     1273        $alt_help = __('Also used as alternate text for the image');
     1274    }
     1275
     1276    return '
    12811277    <table class="describe"><tbody>
    12821278        <tr>
    … …  
    12951291            <td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td>
    12961292        </tr>
    1297 ';
    1298     // CAPTIONS_OFF is temporary. Do not use it.
    1299     if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
    1300         $form .= '
     1293
    13011294        <tr>
    13021295            <th valign="top" scope="row" class="label">
    1303                 <span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span>
     1296                <span class="alignleft"><label for="alt">' . $alt . '</label></span>
    13041297            </th>
    13051298            <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
    1306             <p class="help">' . __('Alt text for the image, e.g. "The Mona Lisa"') . '</p></td>
    1307         </tr>
    1308 ';
    1309 
    1310     } else {
    1311         $form .= '
    1312         <tr>
    1313             <th valign="top" scope="row" class="label">
    1314                 <span class="alignleft"><label for="alt">' . __('Image Caption') . '</label></span>
    1315             </th>
    1316             <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
    1317             <p class="help">' . __('Also used as alternate text for the image') . '</p></td>
    1318         </tr>
    1319 ';
    1320     }
    1321         $form .= '
     1299            <p class="help">' . $alt_help . '</p></td>
     1300        </tr>
     1301
    13221302        <tr class="align">
    13231303            <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
    … …  
    13541334';
    13551335
    1356     return $form;
    13571336}
    13581337

  • branches/2.6/wp-admin/includes/taxonomy.php

    r8582 r8621  
    134134    foreach ( $tags as $tag )
    135135        $tag_names[] = $tag->name;
    136     $tags_to_edit = join( ', ', $tag_names );
     136    $tags_to_edit = join( ',', $tag_names );
    137137    $tags_to_edit = attribute_escape( $tags_to_edit );
    138138    $tags_to_edit = apply_filters( 'tags_to_edit', $tags_to_edit );

  • branches/2.6/wp-admin/install-helper.php

    r8582 r8621  
    1010 **           false on error
    1111 */
     12if ( ! function_exists('maybe_create_table') ) :
    1213function maybe_create_table($table_name, $create_ddl) {
    1314    global $wpdb;
    … …  
    2728    return false;
    2829}
     30endif;
    2931
    3032/**
    … …  
    3436 **           false on error
    3537 */
     38if ( ! function_exists('maybe_add_column') ) :
    3639function maybe_add_column($table_name, $column_name, $create_ddl) {
    3740    global $wpdb, $debug;
    … …  
    5255    return false;
    5356}
    54 
     57endif;
    5558
    5659/**

  • branches/2.6/wp-admin/rtl.css

    r8582 r8621  
    1111.code, #quicktags #ed_code {
    1212    font-family: monospace !important;
     13}
     14
     15/* Clears update nag, so it doesn't hide the submenu */
     16#update-nag {
     17    clear: both;
     18    margin-bottom: 1em;
    1319}
    1420
    … …  
    114120}
    115121
    116 .tablenav div
    117 {
    118     float:right!important
     122.tablenav div
     123{
     124    float:right !important;
     125    direction: rtl;
    119126}
    120127
    … …  
    323330    clear: both;
    324331}
     332
     333/* WPH - TinyMCE */
     334
     335#media-items th.label {
     336    width: 120px;
     337}
     338#media-items th.label .alignleft {
     339    width: 100px;
     340}
     341
     342#media-items th.label .alignright {
     343    width: 16px;
     344    height: 16px;
     345}
     346
     347/* LTRs some url- and code-only form fields */
     348input#href, input#src, input#class_name {
     349    direction: ltr;
     350    text-align: left;
     351}
     352
     353#sidemenu a {
     354    float: right;
     355}
     356
     357thead.media-item-info {
     358    float: left;
     359    margin-bottom: 18px;
     360    width: 100%;
     361}
     362
     363thead.media-item-info td {
     364    width: 100%;
     365    text-align: left;
     366}
     367
     368thead.media-item-info td.A1B1 {
     369    width: 150px;
     370}
     371
     372#gallery-form table.widefat th {
     373    float: left;
     374    width: 74%;
     375    text-align: center;
     376}
     377
     378#gallery-form table.widefat th.order-head {
     379    width: 18%;
     380}
     381
     382#media-upload tr.align td.field, #media-upload tr.image-size td.field {
     383    text-align: right !important;
     384}
     385
     386#media-upload tr.align td.field {
     387    float:right;
     388    margin-right:-15px;
     389}
     390
     391tr.image-size label {
     392    display:inline;
     393    margin:0 0 0 1em !important;
     394}
     395
     396#library-form {
     397    float: right;
     398}
     399
     400#filter .subsubsub {
     401    direction: rtl;
     402    text-align: right;
     403}
     404
     405#media-upload form#filter {
     406    margin-right: -20px;
     407}

  • branches/2.6/wp-includes/canonical.php

    r8582 r8621  
    166166            foreach ( array('single', 'category', 'page', 'day', 'month', 'year') as $type ) {
    167167                $func = 'is_' . $type;
    168                 if ( call_user_func($func) )
     168                if ( call_user_func($func) ) {
    169169                    $user_ts_type = $type;
    170170                    break;
    171171                }
    172172            }
     173        }
    173174        $redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
    174175    } elseif ( is_home() ) {

  • branches/2.6/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

    r8582 r8621  
    55<title></title>
    66
    7 <script type="text/javascript" src="js/editimage.js?ver=311f"></script>
     7<script type="text/javascript" src="js/editimage.js?ver=311g"></script>
    88<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
    99
    10 <link rel="stylesheet" href="css/editimage.css?ver=311f" type="text/css" media="all" />
    11 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6" type="text/css" media="all" />
     10<link rel="stylesheet" href="css/editimage.css?ver=311g" type="text/css" media="all" />
     11<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6.1" type="text/css" media="all" />
    1212<script type="text/javascript">
    1313if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )

  • branches/2.6/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

    r8582 r8621  
    1616                    return;
    1717
    18                 tb_show('', url + '/editimage.html?ver=311f&TB_iframe=true');
     18                tb_show('', url + '/editimage.html?ver=311g&TB_iframe=true');
    1919                tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
    2020            });

  • branches/2.6/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

    r8582 r8621  
    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

  • branches/2.6/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css

    r8582 r8621  
    99h6 {font-size: .75em}
    1010.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
    11 a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.gif) no-repeat bottom left;}
    12 img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}
     11a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.gif) no-repeat bottom left;}
     12img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.gif) no-repeat;}
    1313img {border:0;}
    1414table {cursor:default}

  • branches/2.6/wp-includes/js/tinymce/tiny_mce_config.php

    r8582 r8621  
    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
    … …  
    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"
    … …  
    226226if ( $disk_cache ) {
    227227
    228     $cacheKey = apply_filters('tiny_mce_version', '20080731');
     228    $cacheKey = apply_filters('tiny_mce_version', '20080810');
    229229
    230230    foreach ( $initArray as $v )

  • branches/2.6/wp-includes/js/tinymce/wordpress.css

    r8582 r8621  
    7777}
    7878
    79 img.mceItemAnchor {
    80     width: 12px;
    81     height: 12px;
    82     background: url(img/items.gif) no-repeat;
    83 }
    84 
    85 a.mceItemAnchor {
    86     width: 12px;
    87     line-height: 6px;
    88     overflow: hidden;
    89     padding-left: 12px;
    90     background: url(img/items.gif) no-repeat bottom left;
    91 }
    92 
    9379.mceIEcenter {
    9480    text-align: center;

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

    r8582 r8621  
    355355
    356356function img_caption_shortcode($attr, $content = null) {
    357 
    358     if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
    359         return $content;
    360357
    361358    // Allow plugins/themes to override the default caption template.

  • branches/2.6/wp-includes/rewrite.php

    r8582 r8621  
    448448
    449449        if (empty($this->category_base))
    450             $this->category_base = 'category';
    451         $this->category_structure = trailingslashit( $this->front . $this->category_base );
     450            $this->category_structure = trailingslashit( $this->front . 'category' );
     451        else
     452            $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
    452453
    453454        $this->category_structure .= '%category%';
    … …  
    467468
    468469        if (empty($this->tag_base))
    469             $this->tag_base = 'tag';
    470         $this->tag_structure = trailingslashit( $this->front . $this->tag_base );
     470            $this->tag_structure = trailingslashit( $this->front . 'tag' );
     471        else
     472            $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
    471473
    472474        $this->tag_structure .= '%tag%';

  • branches/2.6/wp-includes/script-loader.php

    r8582 r8621  
    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', '20080810');
    4141    $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
    4242

  • branches/2.6/wp-includes/version.php

    r8582 r8621  
    99 * @global string $wp_version
    1010 */
    11 $wp_version = '2.6.1-beta1';
     11$wp_version = '2.6.1-beta2';
    1212
    1313/**
    … …  
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 8203;
     18$wp_db_version = 8204;
    1919
    2020?>
Note: See TracChangeset for help on using the changeset viewer.