WordPress.org

Make WordPress Core

Changeset 19054


Ignore:
Timestamp:
10/24/2011 07:13:23 PM (9 years ago)
Author:
ryan
Message:

Pinking shears

Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/ie-rtl.dev.css

    r18975 r19054  
    127127}
    128128
    129 /* nav menus 
     129/* nav menus
    130130.menu-max-depth-0 #menu-management { width: 460px; }
    131131.menu-max-depth-1 #menu-management { width: 490px; }
  • trunk/wp-admin/edit-form-advanced.php

    r19013 r19054  
    213213    $about_pages = '<p>' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
    214214        '<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the new in 3.2 distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '</p>';
    215    
     215
    216216    $current_screen->add_help_tab( array(
    217217        'id'      => 'about-pages',
     
    219219        'content' => $about_pages,
    220220    ) );
    221    
     221
    222222    $page_attributes = '<p>' . __('<strong>Parent</strong> - You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
    223223        '<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
    224224        '<p>' . __('<strong>Order</strong> - Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';
    225    
     225
    226226    $current_screen->add_help_tab( array(
    227227        'id' => 'page-attributes',
     
    229229        'content' => $page_attributes,
    230230    ) );
    231    
     231
    232232    $current_screen->add_help_sidebar(
    233233            '<p><strong>' . __('For more information:') . '</strong></p>' .
  • trunk/wp-admin/edit-tags.php

    r18990 r19054  
    144144    if ( !current_user_can( $tax->cap->edit_terms ) )
    145145        wp_die( __( 'Cheatin&#8217; uh?' ) );
    146  
    147     $tag = get_term( $tag_ID, $taxonomy ); 
     146
     147    $tag = get_term( $tag_ID, $taxonomy );
    148148    if ( ! $tag )
    149149        wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
  • trunk/wp-admin/includes/class-wp-posts-list-table.php

    r19047 r19054  
    865865    <?php
    866866            endif; // hierarchical
    867    
     867
    868868            if ( !$bulk ) : ?>
    869869
     
    997997            </div>
    998998
    999     <?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) : 
     999    <?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) :
    10001000        $post_formats = get_theme_support( 'post-formats' );
    10011001        if ( isset( $post_formats[0] ) && is_array( $post_formats[0] ) ) :
  • trunk/wp-admin/includes/class-wp-upgrader.php

    r18632 r19054  
    15401540            $attachment = get_post( $this->id );
    15411541            if ( empty($attachment) )
    1542                 wp_die(__('Please select a file')); 
     1542                wp_die(__('Please select a file'));
    15431543
    15441544            $this->filename = $attachment->post_title;
  • trunk/wp-admin/includes/deprecated.php

    r19050 r19054  
    711711function wp_tiny_mce() {
    712712    _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
    713    
     713
    714714    wp_editor('', 'content');
    715715}
  • trunk/wp-admin/includes/file.php

    r18841 r19054  
    348348    copy( $tmp_file, $new_file );
    349349    unlink($tmp_file);
    350    
     350
    351351    // Set correct file permissions
    352352    $stat = stat( dirname( $new_file ));
  • trunk/wp-admin/includes/media.php

    r19046 r19054  
    13641364</div>
    13651365
    1366 <p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?> 
     1366<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?>
    13671367<?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
    13681368
     
    20052005?>
    20062006</label></p>
    2007 <?php 
     2007<?php
    20082008}
    20092009
  • trunk/wp-admin/includes/post.php

    r18847 r19054  
    599599 *
    600600 * @since 2.0.0
    601  
     601
    602602 * @uses wp_write_post()
    603603 * @uses is_wp_error()
  • trunk/wp-admin/includes/screen.php

    r19053 r19054  
    334334     */
    335335    private $_help_tabs = array();
    336  
     336
    337337    /**
    338338     * The help sidebar data associated with screen, if any.
     
    396396     */
    397397    public function get( $hook_name = '' ) {
    398  
     398
    399399        if ( is_a( $hook_name, 'WP_Screen' ) )
    400400            return $hook_name;
    401  
     401
    402402        $action = $post_type = $taxonomy = '';
    403403
     
    426426            $id = str_replace( array( '-new', '-add' ), '', $id );
    427427        }
    428  
     428
    429429        if ( 'index' == $id )
    430430            $id = 'dashboard';
    431  
     431
    432432        $base = $id;
    433  
     433
    434434        // If this is the current screen, see if we can be more accurate for post types and taxonomies.
    435435        if ( ! $hook_name ) {
     
    467467            }
    468468        }
    469  
     469
    470470        switch ( $base ) {
    471471            case 'post' :
     
    485485                break;
    486486        }
    487  
     487
    488488        if ( is_network_admin() ) {
    489489            $id   .= '-network';
     
    493493            $base .= '-user';
    494494        }
    495  
     495
    496496        if ( isset( self::$_registry[ $id ] ) )
    497497            return self::$_registry[ $id ];
     
    510510        return $screen;
    511511    }
    512  
     512
    513513    /**
    514514     * Makes the screen object the current screen.
     
    544544     */
    545545    static function add_old_compat_help( $screen, $help ) {
    546         self::$_old_compat_help[ $screen->id ] = $help; 
     546        self::$_old_compat_help[ $screen->id ] = $help;
    547547    }
    548548
  • trunk/wp-admin/js/common.dev.js

    r19045 r19054  
    143143
    144144        columns.height('auto');
    145    
     145
    146146        height = Math.max.apply( null, $.map( columns, function( el ) { return $(el).height(); }) );
    147147        columns.height( height );
  • trunk/wp-admin/js/editor.dev.js

    r18576 r19054  
    11
    22var switchEditors = {
    3    
     3
    44    go: function(a) {
    55        var t = this, aid = a.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4),
    66            ed = tinyMCE.get(id), wrap_id = 'wp-'+id+'-wrap', dom = tinymce.DOM, txtarea_el = dom.get(id);
    7    
     7
    88        if ( 'tmce' == mode ) {
    99            if ( ed && ! ed.isHidden() )
     
    1515            if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
    1616                txtarea_el.value = t.wpautop( txtarea_el.value );
    17            
     17
    1818            if ( ed ) {
    1919                ed.show();
     
    2626            dom.addClass(wrap_id, 'tmce-active');
    2727            setUserSetting('editor', 'tinymce');
    28    
     28
    2929        } else if ( 'html' == mode ) {
    3030
    3131            if ( ed && ed.isHidden() )
    3232                return false;
    33            
     33
    3434            if ( ed ) {
    3535                txtarea_el.style.height = ed.getContentAreaContainer().offsetHeight + 20 + 'px';
     
    4343        return false;
    4444    },
    45    
     45
    4646    _wp_Nop : function(content) {
    4747        var blocklist1, blocklist2;
  • trunk/wp-admin/network.php

    r19018 r19054  
    524524    install_network();
    525525    $hostname = get_clean_basedomain();
    526     $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false; 
     526    $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
    527527    if ( ! network_domain_check() ) {
    528528        $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install );
  • trunk/wp-admin/press-this.php

    r19028 r19054  
    579579        if ( $url ) {
    580580            $content .= '<p>';
    581            
     581
    582582            if ( $selection )
    583583                $content .= __('via ');
    584            
     584
    585585            $content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
    586586        }
     
    603603
    604604        wp_editor( $content, 'content', $editor_settings );
    605        
     605
    606606        ?>
    607607        </div>
     
    620620    </tr></table>
    621621</div>
    622 <?php 
     622<?php
    623623do_action('admin_footer');
    624624do_action('admin_print_footer_scripts');
  • trunk/wp-admin/update-core.php

    r19003 r19054  
    1313wp_enqueue_script( 'plugin-install' );
    1414add_thickbox();
    15    
     15
    1616if ( is_multisite() && ! is_network_admin() ) {
    1717    wp_redirect( network_admin_url( 'update-core.php' ) );
     
    251251            $upgrade_notice = '';
    252252        }
    253        
     253
    254254        $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&TB_iframe=true&width=640&height=662');
    255         $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); 
     255        $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
    256256        $details = sprintf('<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>.', esc_url($details_url), esc_attr($plugin_data->Name), $details_text);
    257        
     257
    258258        echo "
    259259    <tr class='active'>
  • trunk/wp-includes/class-http.php

    r19000 r19054  
    16271627     *
    16281628     * Certain Servers will return deflated data with headers which PHP's gziniflate()
    1629      * function cannot handle out of the box. The following function has been created from 
    1630      * various snippets on the gzinflate() PHP documentation. 
     1629     * function cannot handle out of the box. The following function has been created from
     1630     * various snippets on the gzinflate() PHP documentation.
    16311631     *
    16321632     * Warning: Magic numbers within. Due to the potential different formats that the compressed
    16331633     * data may be returned in, some "magic offsets" are needed to ensure proper decompression
    1634      * takes place. For a simple progmatic way to determine the magic offset in use, see: 
     1634     * takes place. For a simple progmatic way to determine the magic offset in use, see:
    16351635     * http://core.trac.wordpress.org/ticket/18273
    16361636     *
  • trunk/wp-includes/class-wp-editor.php

    r19028 r19054  
    376376                    $mce_buttons_2[$key] = 'wp_fullscreen';
    377377                elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
    378                     $mce_buttons_3[$key] = 'wp_fullscreen'; 
     378                    $mce_buttons_3[$key] = 'wp_fullscreen';
    379379                elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
    380380                    $mce_buttons_4[$key] = 'wp_fullscreen';
  • trunk/wp-includes/functions.php

    r19044 r19054  
    28272827            header( 'Content-Type: text/html; charset=utf-8' );
    28282828        }
    2829    
     2829
    28302830        if ( empty($title) )
    28312831            $title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
    2832    
     2832
    28332833        $text_direction = 'ltr';
    28342834        if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
  • trunk/wp-includes/functions.wp-scripts.php

    r18561 r19054  
    7878 * the object would contain all values. In that case if two or more keys are the same,
    7979 * the last value overwrites the previous. The function is named "localize_script" because of historical reasons.
    80  * 
     80 *
    8181 * @since r16
    8282 * @see WP_Scripts::add_script_data()
  • trunk/wp-includes/functions.wp-styles.php

    r18561 r19054  
    4545 * added to the same stylesheet $handle, they will be printed in the order
    4646 * they were added, i.e. the latter added styles can redeclare the previous.
    47  * 
     47 *
    4848 * @since 3.3
    4949 * @see WP_Scripts::add_inline_style()
  • trunk/wp-includes/link-template.php

    r18827 r19054  
    11291129
    11301130            $excluded_categories = array_map( 'intval', $excluded_categories );
    1131                
     1131
    11321132            if ( ! empty( $cat_array ) ) {
    11331133                $excluded_categories = array_diff($excluded_categories, $cat_array);
     
    12771277    if( ! is_array( $excluded_categories ) )
    12781278        $excluded_categories = explode( ',', $excluded_categories );
    1279        
     1279
    12801280    if ( $in_same_cat || ! empty( $excluded_categories ) ) {
    12811281        if ( $in_same_cat )
  • trunk/wp-includes/meta.php

    r18835 r19054  
    308308 * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
    309309 * @param int $object_id ID of the object metadata is for
    310  * @param string $meta_key Metadata key. 
     310 * @param string $meta_key Metadata key.
    311311 * @return boolean true of the key is set, false if not.
    312312 */
  • trunk/wp-includes/post.php

    r19034 r19054  
    10411041
    10421042    do_action( 'registered_post_type', $post_type, $args );
    1043    
     1043
    10441044    return $args;
    10451045}
     
    53095309/**
    53105310 * Update the custom taxonomies' term counts when a post's status is changed. For example, default posts term counts (for custom taxonomies) don't include private / draft posts.
    5311  * 
     5311 *
    53125312 * @access private
    53135313 * @param string $new_status
  • trunk/wp-includes/taxonomy.php

    r19037 r19054  
    28552855
    28562856    $object_types = (array) $taxonomy->object_type;
    2857    
     2857
    28582858    foreach ( $object_types as &$object_type )
    28592859        list( $object_type ) = explode( ':', $object_type );
     
    28792879            $count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
    28802880
    2881        
     2881
    28822882        do_action( 'edit_term_taxonomy', $term, $taxonomy );
    28832883        $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
  • trunk/wp-includes/update.php

    r19022 r19054  
    331331
    332332    $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
    333    
     333
    334334    return array( 'counts' => $counts, 'title' => $update_title );
    335335}
  • trunk/wp-includes/widgets.php

    r18995 r19054  
    11511151 * @access private
    11521152 * @since 3.3
    1153  */ 
     1153 */
    11541154function _wp_sidebars_changed() {
    11551155    global $sidebars_widgets;
Note: See TracChangeset for help on using the changeset viewer.