WordPress.org

Make WordPress Core

Changeset 22634


Ignore:
Timestamp:
11/17/2012 03:11:29 PM (7 years ago)
Author:
ryan
Message:

Pinking shears

Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-activate.php

    r22266 r22634  
    33 * Confirms that the activation key that is sent in an email after a user signs
    44 * up for a new blog matches the key for that user and then displays confirmation.
    5  * 
     5 *
    66 * @package WordPress
    77 */
     
    2727/**
    2828 * Adds an action hook specific to this page that fires on wp_head
    29  * 
     29 *
    3030 * @since MU
    3131 */
     
    3737/**
    3838 * Loads styles specific to this page.
    39  * 
     39 *
    4040 * @since MU
    4141 */
  • trunk/wp-admin/css/wp-admin-rtl.css

    r22629 r22634  
    476476        margin-right: 52px;
    477477    }
    478    
     478
    479479    .auto-fold #adminmenu div.wp-menu-image {
    480480        float: right;
  • trunk/wp-admin/css/wp-admin.css

    r22629 r22634  
    83818381        background-size: 21px 37px;
    83828382    }
    8383    
     8383
    83848384    .welcome-panel .welcome-panel-close:before {
    83858385        background-image: url('../images/xit-2x.gif');
    83868386        background-size: 20px auto;
    83878387    }
    8388    
     8388
    83898389    .welcome-panel .welcome-add-page {
    83908390        background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px;
     
    84218421        background-size: 16px;
    84228422    }
    8423    
     8423
    84248424    .login h1 a {
    84258425        background-image: url('../images/wordpress-logo-2x.png?ver=20120412');
     
    84318431        background-size: 173px 194px;
    84328432    }
    8433    
     8433
    84348434    .wp-full-overlay .collapse-sidebar-arrow {
    84358435        background-image: url('../images/arrows-2x.png');
    84368436        background-size: 15px 123px;
    84378437     }
    8438      
     8438
    84398439    .pressthis a span {
    84408440        background-image: url(../images/press-this-2x.png?v=20121105);
    84418441    }
    8442    
     8442
    84438443    .imgedit-crop,
    84448444    .imgedit-rleft,
     
    84518451        background-size: 260px 64px;
    84528452    }
    8453    
     8453
    84548454    .spinner,
    84558455    .imgedit-wait,
  • trunk/wp-admin/customize.php

    r22474 r22634  
    7272<div class="wp-full-overlay expanded">
    7373    <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
    74        
     74
    7575        <div id="customize-header-actions" class="wp-full-overlay-header">
    7676            <?php
     
    8383            </a>
    8484        </div>
    85        
     85
    8686        <?php
    8787            $screenshot = $wp_customize->theme()->get_screenshot();
  • trunk/wp-admin/install.php

    r22419 r22634  
    5959    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    6060    <title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
    61     <?php 
     61    <?php
    6262    wp_admin_css( 'install', true );
    6363    ?>
  • trunk/wp-admin/menu-header.php

    r21877 r22634  
    110110            echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
    111111            echo "<li class='wp-submenu-head'>{$item[0]}</li>";
    112    
     112
    113113            $first = true;
    114114            foreach ( $submenu_items as $sub_key => $sub_item ) {
  • trunk/wp-admin/plugin-install.php

    r22026 r22634  
    4848    '<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
    4949    '<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, and Newest plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
    50     '<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' . 
     50    '<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
    5151    '<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
    5252) );
  • trunk/wp-includes/cache.php

    r22118 r22634  
    630630        $this->multisite = is_multisite();
    631631        $this->blog_prefix =  $this->multisite ? $blog_id . ':' : '';
    632        
     632
    633633
    634634        /**
  • trunk/wp-includes/category.php

    r22260 r22634  
    166166 * @since 1.0.0
    167167 *
    168  * @param string $cat_name Category name. 
     168 * @param string $cat_name Category name.
    169169 * @return int 0, if failure and ID of category on success.
    170170 */
  • trunk/wp-includes/class-wp-customize-manager.php

    r21354 r22634  
    7474     *
    7575     * @param mixed $ajax_message AJAX return
    76      * @param mixed $message UI message 
     76     * @param mixed $message UI message
    7777     */
    7878    protected function wp_die( $ajax_message, $message = null ) {
     
    9999        return '_default_wp_die_handler';
    100100    }
    101    
     101
    102102    /**
    103103     * Start preview and customize theme.
     
    141141        $this->start_previewing_theme();
    142142    }
    143    
     143
    144144    /**
    145145     * Callback to validate a theme once it is loaded
  • trunk/wp-includes/class-wp-customize-setting.php

    r22448 r22634  
    381381 */
    382382class WP_Customize_Filter_Setting extends WP_Customize_Setting {
    383    
     383
    384384    /**
    385385     * @since 3.4.0
  • trunk/wp-includes/css/admin-bar.css

    r22629 r22634  
    608608        background-size: 20px 220px;
    609609    }
    610    
     610
    611611    #wpadminbar .quicklinks li div.blavatar {
    612612        background: url('../images/wpmini-blue-2x.png') no-repeat;
  • trunk/wp-includes/functions.php

    r22471 r22634  
    21302130            display: inline-block;
    21312131            text-decoration: none;
    2132             font-size: 14px; 
     2132            font-size: 14px;
    21332133            line-height: 23px;
    21342134            height: 24px;
     
    21542154            text-shadow: 0 1px 0 #fff;
    21552155        }
    2156        
     2156
    21572157        .button.button-large {
    21582158            height: 29px;
     
    21732173            color: #222;
    21742174        }
    2175        
     2175
    21762176        .button:focus  {
    21772177            -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);
  • trunk/wp-includes/general-template.php

    r22483 r22634  
    16321632        /* translators: 1: blog name, 2: separator(raquo), 3: search phrase */
    16331633        'searchtitle' => __('%1$s %2$s Search Results for &#8220;%3$s&#8221; Feed'),
    1634         /* translators: 1: blog name, 2: separator(raquo), 3: post type name */ 
    1635         'posttypetitle' => __('%1$s %2$s %3$s Feed'),       
     1634        /* translators: 1: blog name, 2: separator(raquo), 3: post type name */
     1635        'posttypetitle' => __('%1$s %2$s %3$s Feed'),
    16361636    );
    16371637
     
    16641664        $title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
    16651665        $href = get_search_feed_link();
    1666     } elseif ( is_post_type_archive() ) { 
    1667         $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) ); 
    1668         $href = get_post_type_archive_feed_link( get_queried_object()->name ); 
    1669     } 
     1666    } elseif ( is_post_type_archive() ) {
     1667        $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
     1668        $href = get_post_type_archive_feed_link( get_queried_object()->name );
     1669    }
    16701670
    16711671    if ( isset($title) && isset($href) )
  • trunk/wp-includes/js/admin-bar.js

    r22262 r22634  
    1414
    1515        adminbar.removeClass('nojq').removeClass('nojs');
    16        
     16
    1717        if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // touch screen device
    1818            // close any open drop-downs when the click/touch is not on the toolbar
  • trunk/wp-includes/js/colorpicker.js

    r21592 r22634  
    1212// site, or any other form where the code is actually being used. You
    1313// may not put the plain javascript up on your site for download or
    14 // include it in your javascript libraries for download. 
     14// include it in your javascript libraries for download.
    1515// If you wish to share this code with others, please just point them
    1616// to the URL instead.
     
    2222/* SOURCE FILE: AnchorPosition.js */
    2323
    24 /* 
     24/*
    2525AnchorPosition.js
    2626Author: Matt Kruse
     
    3131
    3232COMPATABILITY: Netscape 4.x,6.x,Mozilla, IE 5.x,6.x on Windows. Some small
    33 positioning errors - usually with Window positioning - occur on the 
     33positioning errors - usually with Window positioning - occur on the
    3434Macintosh platform.
    3535
     
    4545NOTES:
    4646
    47 1) For popping up separate browser windows, use getAnchorWindowPosition. 
     471) For popping up separate browser windows, use getAnchorWindowPosition.
    4848   Otherwise, use getAnchorPosition
    4949
    50 2) Your anchor tag MUST contain both NAME and ID attributes which are the 
     502) Your anchor tag MUST contain both NAME and ID attributes which are the
    5151   same. For example:
    5252   <A NAME="test" ID="test"> </A>
    5353
    54 3) There must be at least a space between <A> </A> for IE5.5 to see the 
     543) There must be at least a space between <A> </A> for IE5.5 to see the
    5555   anchor tag correctly. Do not do <A></A> with no space.
    56 */ 
     56*/
    5757
    5858// getAnchorPosition(anchorname)
     
    152152/* SOURCE FILE: PopupWindow.js */
    153153
    154 /* 
     154/*
    155155PopupWindow.js
    156156Author: Matt Kruse
     
    162162
    163163COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
    164 positioning errors - usually with Window positioning - occur on the 
    165 Macintosh platform. Due to bugs in Netscape 4.x, populating the popup 
     164positioning errors - usually with Window positioning - occur on the
     165Macintosh platform. Due to bugs in Netscape 4.x, populating the popup
    166166window with <STYLE> tags may cause errors.
    167167
    168168USAGE:
    169169// Create an object for a WINDOW popup
    170 var win = new PopupWindow(); 
     170var win = new PopupWindow();
    171171
    172172// Create an object for a DIV window using the DIV named 'mydiv'
    173 var win = new PopupWindow('mydiv'); 
    174 
    175 // Set the window to automatically hide itself when the user clicks 
     173var win = new PopupWindow('mydiv');
     174
     175// Set the window to automatically hide itself when the user clicks
    176176// anywhere else on the page except the popup
    177 win.autoHide(); 
     177win.autoHide();
    178178
    179179// Show the window relative to the anchor name passed in
     
    186186win.setSize(width,height);
    187187
    188 // Populate the contents of the popup window that will be shown. If you 
     188// Populate the contents of the popup window that will be shown. If you
    189189// change the contents while it is displayed, you will need to refresh()
    190190win.populate(string);
     
    2062061) Requires the functions in AnchorPosition.js
    207207
    208 2) Your anchor tag MUST contain both NAME and ID attributes which are the 
     2082) Your anchor tag MUST contain both NAME and ID attributes which are the
    209209   same. For example:
    210210   <A NAME="test" ID="test"> </A>
    211211
    212 3) There must be at least a space between <A> </A> for IE5.5 to see the 
     2123) There must be at least a space between <A> </A> for IE5.5 to see the
    213213   anchor tag correctly. Do not do <A></A> with no space.
    214214
     
    217217   an event handler for 'onmouseup' after you define a PopupWindow object or
    218218   the autoHide() will not work correctly.
    219 */ 
     219*/
    220220
    221221// Set the position of the popup window based on the anchor
     
    256256            document.getElementById(this.divName).innerHTML = this.contents;
    257257            }
    258         else if (this.use_css) { 
     258        else if (this.use_css) {
    259259            document.all[this.divName].innerHTML = this.contents;
    260260            }
    261         else if (this.use_layers) { 
    262             var d = document.layers[this.divName]; 
     261        else if (this.use_layers) {
     262            var d = document.layers[this.divName];
    263263            d.document.open();
    264264            d.document.writeln(this.contents);
     
    471471/* SOURCE FILE: ColorPicker2.js */
    472472
    473 /* 
     473/*
    474474Last modified: 02/24/2003
    475475
    476 DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB 
    477 form. It uses a color "swatch" to display the standard 216-color web-safe 
     476DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB
     477form. It uses a color "swatch" to display the standard 216-color web-safe
    478478palette. The user can then click on a color to select it.
    479479
     
    501501// Write the 'pickColor' function that will be called when the user clicks
    502502// a color and do something with the value. This is only required if you
    503 // want to do something other than simply populate a form field, which is 
     503// want to do something other than simply populate a form field, which is
    504504// what the 'select' function will give you.
    505505function pickColor(color) {
     
    5105101) Requires the functions in AnchorPosition.js and PopupWindow.js
    511511
    512 2) Your anchor tag MUST contain both NAME and ID attributes which are the 
     5122) Your anchor tag MUST contain both NAME and ID attributes which are the
    513513   same. For example:
    514514   <A NAME="test" ID="test"> </A>
    515515
    516 3) There must be at least a space between <A> </A> for IE5.5 to see the 
     5163) There must be at least a space between <A> </A> for IE5.5 to see the
    517517   anchor tag correctly. Do not do <A></A> with no space.
    518518
     
    521521   an event handler for 'onmouseup' after you define a ColorPicker object or
    522522   the color picker will not hide itself correctly.
    523 */ 
     523*/
    524524ColorPicker_targetInput = null;
    525525function ColorPicker_writeDiv() {
     
    549549// have the value populate a form field, which is what most people want to do.
    550550function ColorPicker_select(inputobj,linkname) {
    551     if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") { 
    552         alert("colorpicker.select: Input object passed is not a valid form input object"); 
     551    if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") {
     552        alert("colorpicker.select: Input object passed is not a valid form input object");
    553553        window.ColorPicker_targetInput=null;
    554554        return;
     
    683683        else { mo = ""; }
    684684        cp_contents += '<td style="background-color: '+colors[i]+';"><a href="javascript:void()" onclick="'+windowRef+'ColorPicker_pickColor(\''+colors[i]+'\','+windowRef+'window.popupWindowObjects['+cp.index+']);return false;" '+mo+'>&nbsp;</a></td>';
    685         if ( ((i+1)>=total) || (((i+1) % width) == 0)) { 
     685        if ( ((i+1)>=total) || (((i+1) % width) == 0)) {
    686686            cp_contents += "</tr>";
    687687            }
  • trunk/wp-includes/ms-blogs.php

    r22185 r22634  
    328328        else
    329329            do_action( 'make_undelete_blog', $blog_id );
    330     }   
    331    
     330    }
     331
    332332    if ( isset( $details[ 'public' ] ) ) {
    333333        switch_to_blog( $blog_id );
     
    530530        else
    531531            $global_groups = false;
    532    
     532
    533533        wp_cache_init();
    534534
     
    591591        else
    592592            $global_groups = false;
    593    
     593
    594594        wp_cache_init();
    595595
  • trunk/wp-includes/post-template.php

    r22451 r22634  
    442442                else
    443443                    $classes[] = 'single-format-standard';
    444             }           
     444            }
    445445        }
    446446
     
    460460            if ( isset( $author->user_nicename ) ) {
    461461                $classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
    462                 $classes[] = 'author-' . $author->ID;               
     462                $classes[] = 'author-' . $author->ID;
    463463            }
    464464        } elseif ( is_category() ) {
     
    467467            if ( isset( $cat->term_id ) ) {
    468468                $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
    469                 $classes[] = 'category-' . $cat->term_id;               
     469                $classes[] = 'category-' . $cat->term_id;
    470470            }
    471471        } elseif ( is_tag() ) {
     
    474474            if ( isset( $tags->term_id ) ) {
    475475                $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
    476                 $classes[] = 'tag-' . $tags->term_id;               
     476                $classes[] = 'tag-' . $tags->term_id;
    477477            }
    478478        } elseif ( is_tax() ) {
  • trunk/wp-includes/query.php

    r22465 r22634  
    27752775        if ( $this->posts ) {
    27762776            $this->post_count = count( $this->posts );
    2777            
     2777
    27782778            $this->posts = array_map( 'get_post', $this->posts );
    27792779
     
    27812781                update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
    27822782
    2783             $this->post = reset( $this->posts );           
     2783            $this->post = reset( $this->posts );
    27842784        } else {
    27852785            $this->post_count = 0;
  • trunk/wp-includes/taxonomy.php

    r22476 r22634  
    332332    $args = wp_parse_args($args, $defaults);
    333333
    334     if ( strlen( $taxonomy ) > 32 ) 
     334    if ( strlen( $taxonomy ) > 32 )
    335335        return new WP_Error( 'taxonomy_too_long', __( 'Taxonomies cannot exceed 32 characters in length' ) );
    336336
  • trunk/wp-includes/template.php

    r22293 r22634  
    314314    global $posts;
    315315
    316     if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) { 
     316    if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
    317317        $type = explode( '/', $posts[0]->post_mime_type );
    318318
Note: See TracChangeset for help on using the changeset viewer.