Changeset 22634

Timestamp:

11/17/2012 03:11:29 PM (12 years ago)

Author:

ryan

Message:

Pinking shears

Location:

trunk

Files:

• wp-activate.php (modified) (3 diffs)
• wp-admin/css/wp-admin-rtl.css (modified) (1 diff)
• wp-admin/css/wp-admin.css (modified) (4 diffs)
• wp-admin/customize.php (modified) (2 diffs)
• wp-admin/install.php (modified) (1 diff)
• wp-admin/menu-header.php (modified) (1 diff)
• wp-admin/plugin-install.php (modified) (1 diff)
• wp-includes/cache.php (modified) (1 diff)
• wp-includes/category.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (3 diffs)
• wp-includes/class-wp-customize-setting.php (modified) (1 diff)
• wp-includes/css/admin-bar.css (modified) (1 diff)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/js/admin-bar.js (modified) (1 diff)
• wp-includes/js/colorpicker.js (modified) (16 diffs)
• wp-includes/ms-blogs.php (modified) (3 diffs)
• wp-includes/post-template.php (modified) (4 diffs)
• wp-includes/query.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)
• wp-includes/template.php (modified) (1 diff)

trunk/wp-activate.php

@@ -3 +3 @@
  * Confirms that the activation key that is sent in an email after a user signs
  * up for a new blog matches the key for that user and then displays confirmation.
- * 
+ *
  * @package WordPress
  */
@@ -27 +27 @@
 /**
  * Adds an action hook specific to this page that fires on wp_head
- * 
+ *
  * @since MU
  */
@@ -37 +37 @@
 /**
  * Loads styles specific to this page.
- * 
+ *
  * @since MU
  */

trunk/wp-admin/css/wp-admin-rtl.css

@@ -476 +476 @@
         margin-right: 52px;
     }
-    
+
     .auto-fold #adminmenu div.wp-menu-image {
         float: right;

trunk/wp-admin/css/wp-admin.css

@@ -8381 +8381 @@
         background-size: 21px 37px;
     }
-    
+
     .welcome-panel .welcome-panel-close:before {
         background-image: url('../images/xit-2x.gif');
         background-size: 20px auto;
     }
-    
+
     .welcome-panel .welcome-add-page {
         background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px;
@@ -8421 +8421 @@
         background-size: 16px;
     }
-    
+
     .login h1 a {
         background-image: url('../images/wordpress-logo-2x.png?ver=20120412');
@@ -8431 +8431 @@
         background-size: 173px 194px;
     }
-    
+
     .wp-full-overlay .collapse-sidebar-arrow {
         background-image: url('../images/arrows-2x.png');
         background-size: 15px 123px;
      }
-     
+
     .pressthis a span {
         background-image: url(../images/press-this-2x.png?v=20121105);
     }
-    
+
     .imgedit-crop,
     .imgedit-rleft,
@@ -8451 +8451 @@
         background-size: 260px 64px;
     }
-    
+
     .spinner,
     .imgedit-wait,

trunk/wp-admin/customize.php

@@ -72 +72 @@
 <div class="wp-full-overlay expanded">
     <form id="customize-controls" class="wrap wp-full-overlay-sidebar">
-        
+
         <div id="customize-header-actions" class="wp-full-overlay-header">
             <?php
@@ -83 +83 @@
             </a>
         </div>
-        
+
         <?php
             $screenshot = $wp_customize->theme()->get_screenshot();

trunk/wp-admin/install.php

@@ -59 +59 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
-    <?php 
+    <?php
     wp_admin_css( 'install', true );
     ?>

trunk/wp-admin/menu-header.php

@@ -110 +110 @@
             echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
             echo "<li class='wp-submenu-head'>{$item[0]}</li>";
-    
+
             $first = true;
             foreach ( $submenu_items as $sub_key => $sub_item ) {

trunk/wp-admin/plugin-install.php

@@ -48 +48 @@
     '<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>' .
     '<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>' .
-    '<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>' . 
+    '<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>' .
     '<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>'
 ) );

trunk/wp-includes/cache.php

@@ -630 +630 @@
         $this->multisite = is_multisite();
         $this->blog_prefix =  $this->multisite ? $blog_id . ':' : '';
-        
+
 
         /**

trunk/wp-includes/category.php

@@ -166 +166 @@
  * @since 1.0.0
  *
- * @param string $cat_name Category name. 
+ * @param string $cat_name Category name.
  * @return int 0, if failure and ID of category on success.
  */

trunk/wp-includes/class-wp-customize-manager.php

@@ -74 +74 @@
      *
      * @param mixed $ajax_message AJAX return
-     * @param mixed $message UI message 
+     * @param mixed $message UI message
      */
     protected function wp_die( $ajax_message, $message = null ) {
@@ -99 +99 @@
         return '_default_wp_die_handler';
     }
-    
+
     /**
      * Start preview and customize theme.
@@ -141 +141 @@
         $this->start_previewing_theme();
     }
-    
+
     /**
      * Callback to validate a theme once it is loaded

trunk/wp-includes/class-wp-customize-setting.php

@@ -381 +381 @@
  */
 class WP_Customize_Filter_Setting extends WP_Customize_Setting {
-    
+
     /**
      * @since 3.4.0

trunk/wp-includes/css/admin-bar.css

@@ -608 +608 @@
         background-size: 20px 220px;
     }
-    
+
     #wpadminbar .quicklinks li div.blavatar {
         background: url('../images/wpmini-blue-2x.png') no-repeat;

trunk/wp-includes/functions.php

@@ -2130 +2130 @@
             display: inline-block;
             text-decoration: none;
-            font-size: 14px; 
+            font-size: 14px;
             line-height: 23px;
             height: 24px;
@@ -2154 +2154 @@
             text-shadow: 0 1px 0 #fff;
         }
-        
+
         .button.button-large {
             height: 29px;
@@ -2173 +2173 @@
             color: #222;
         }
-        
+
         .button:focus  {
             -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,.2);

trunk/wp-includes/general-template.php

@@ -1632 +1632 @@
         /* translators: 1: blog name, 2: separator(raquo), 3: search phrase */
         'searchtitle' => __('%1$s %2$s Search Results for “%3$s” Feed'),
-        /* translators: 1: blog name, 2: separator(raquo), 3: post type name */ 
-        'posttypetitle' => __('%1$s %2$s %3$s Feed'),       
+        /* translators: 1: blog name, 2: separator(raquo), 3: post type name */
+        'posttypetitle' => __('%1$s %2$s %3$s Feed'),
     );
 
@@ -1664 +1664 @@
         $title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
         $href = get_search_feed_link();
-    } elseif ( is_post_type_archive() ) { 
-        $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) ); 
-        $href = get_post_type_archive_feed_link( get_queried_object()->name ); 
-    } 
+    } elseif ( is_post_type_archive() ) {
+        $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
+        $href = get_post_type_archive_feed_link( get_queried_object()->name );
+    }
 
     if ( isset($title) && isset($href) )

trunk/wp-includes/js/admin-bar.js

@@ -14 +14 @@
 
         adminbar.removeClass('nojq').removeClass('nojs');
-        
+
         if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // touch screen device
             // close any open drop-downs when the click/touch is not on the toolbar

trunk/wp-includes/js/colorpicker.js

@@ -12 +12 @@
 // site, or any other form where the code is actually being used. You
 // may not put the plain javascript up on your site for download or
-// include it in your javascript libraries for download. 
+// include it in your javascript libraries for download.
 // If you wish to share this code with others, please just point them
 // to the URL instead.
@@ -22 +22 @@
 /* SOURCE FILE: AnchorPosition.js */
 
-/* 
+/*
 AnchorPosition.js
 Author: Matt Kruse
@@ -31 +31 @@
 
 COMPATABILITY: Netscape 4.x,6.x,Mozilla, IE 5.x,6.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the 
+positioning errors - usually with Window positioning - occur on the
 Macintosh platform.
 
@@ -45 +45 @@
 NOTES:
 
-1) For popping up separate browser windows, use getAnchorWindowPosition. 
+1) For popping up separate browser windows, use getAnchorWindowPosition.
    Otherwise, use getAnchorPosition
 
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
+2) Your anchor tag MUST contain both NAME and ID attributes which are the
    same. For example:
    <A NAME="test" ID="test"> </A>
 
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
+3) There must be at least a space between <A> </A> for IE5.5 to see the
    anchor tag correctly. Do not do <A></A> with no space.
-*/ 
+*/
 
 // getAnchorPosition(anchorname)
@@ -152 +152 @@
 /* SOURCE FILE: PopupWindow.js */
 
-/* 
+/*
 PopupWindow.js
 Author: Matt Kruse
@@ -162 +162 @@
 
 COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
-positioning errors - usually with Window positioning - occur on the 
-Macintosh platform. Due to bugs in Netscape 4.x, populating the popup 
+positioning errors - usually with Window positioning - occur on the
+Macintosh platform. Due to bugs in Netscape 4.x, populating the popup
 window with <STYLE> tags may cause errors.
 
 USAGE:
 // Create an object for a WINDOW popup
-var win = new PopupWindow(); 
+var win = new PopupWindow();
 
 // Create an object for a DIV window using the DIV named 'mydiv'
-var win = new PopupWindow('mydiv'); 
-
-// Set the window to automatically hide itself when the user clicks 
+var win = new PopupWindow('mydiv');
+
+// Set the window to automatically hide itself when the user clicks
 // anywhere else on the page except the popup
-win.autoHide(); 
+win.autoHide();
 
 // Show the window relative to the anchor name passed in
@@ -186 +186 @@
 win.setSize(width,height);
 
-// Populate the contents of the popup window that will be shown. If you 
+// Populate the contents of the popup window that will be shown. If you
 // change the contents while it is displayed, you will need to refresh()
 win.populate(string);
@@ -206 +206 @@
 1) Requires the functions in AnchorPosition.js
 
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
+2) Your anchor tag MUST contain both NAME and ID attributes which are the
    same. For example:
    <A NAME="test" ID="test"> </A>
 
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
+3) There must be at least a space between <A> </A> for IE5.5 to see the
    anchor tag correctly. Do not do <A></A> with no space.
 
@@ -217 +217 @@
    an event handler for 'onmouseup' after you define a PopupWindow object or
    the autoHide() will not work correctly.
-*/ 
+*/
 
 // Set the position of the popup window based on the anchor
@@ -256 +256 @@
             document.getElementById(this.divName).innerHTML = this.contents;
             }
-        else if (this.use_css) { 
+        else if (this.use_css) {
             document.all[this.divName].innerHTML = this.contents;
             }
-        else if (this.use_layers) { 
-            var d = document.layers[this.divName]; 
+        else if (this.use_layers) {
+            var d = document.layers[this.divName];
             d.document.open();
             d.document.writeln(this.contents);
@@ -471 +471 @@
 /* SOURCE FILE: ColorPicker2.js */
 
-/* 
+/*
 Last modified: 02/24/2003
 
-DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB 
-form. It uses a color "swatch" to display the standard 216-color web-safe 
+DESCRIPTION: This widget is used to select a color, in hexadecimal #RRGGBB
+form. It uses a color "swatch" to display the standard 216-color web-safe
 palette. The user can then click on a color to select it.
 
@@ -501 +501 @@
 // Write the 'pickColor' function that will be called when the user clicks
 // a color and do something with the value. This is only required if you
-// want to do something other than simply populate a form field, which is 
+// want to do something other than simply populate a form field, which is
 // what the 'select' function will give you.
 function pickColor(color) {
@@ -510 +510 @@
 1) Requires the functions in AnchorPosition.js and PopupWindow.js
 
-2) Your anchor tag MUST contain both NAME and ID attributes which are the 
+2) Your anchor tag MUST contain both NAME and ID attributes which are the
    same. For example:
    <A NAME="test" ID="test"> </A>
 
-3) There must be at least a space between <A> </A> for IE5.5 to see the 
+3) There must be at least a space between <A> </A> for IE5.5 to see the
    anchor tag correctly. Do not do <A></A> with no space.
 
@@ -521 +521 @@
    an event handler for 'onmouseup' after you define a ColorPicker object or
    the color picker will not hide itself correctly.
-*/ 
+*/
 ColorPicker_targetInput = null;
 function ColorPicker_writeDiv() {
@@ -549 +549 @@
 // have the value populate a form field, which is what most people want to do.
 function ColorPicker_select(inputobj,linkname) {
-    if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") { 
-        alert("colorpicker.select: Input object passed is not a valid form input object"); 
+    if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") {
+        alert("colorpicker.select: Input object passed is not a valid form input object");
         window.ColorPicker_targetInput=null;
         return;
@@ -683 +683 @@
         else { mo = ""; }
         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>';
-        if ( ((i+1)>=total) || (((i+1) % width) == 0)) { 
+        if ( ((i+1)>=total) || (((i+1) % width) == 0)) {
             cp_contents += "</tr>";
             }

trunk/wp-includes/ms-blogs.php

@@ -328 +328 @@
         else
             do_action( 'make_undelete_blog', $blog_id );
-    }   
-    
+    }
+
     if ( isset( $details[ 'public' ] ) ) {
         switch_to_blog( $blog_id );
@@ -530 +530 @@
         else
             $global_groups = false;
-    
+
         wp_cache_init();
 
@@ -591 +591 @@
         else
             $global_groups = false;
-    
+
         wp_cache_init();
 

trunk/wp-includes/post-template.php

@@ -442 +442 @@
                 else
                     $classes[] = 'single-format-standard';
-            }           
+            }
         }
 
@@ -460 +460 @@
             if ( isset( $author->user_nicename ) ) {
                 $classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
-                $classes[] = 'author-' . $author->ID;               
+                $classes[] = 'author-' . $author->ID;
             }
         } elseif ( is_category() ) {
@@ -467 +467 @@
             if ( isset( $cat->term_id ) ) {
                 $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id );
-                $classes[] = 'category-' . $cat->term_id;               
+                $classes[] = 'category-' . $cat->term_id;
             }
         } elseif ( is_tag() ) {
@@ -474 +474 @@
             if ( isset( $tags->term_id ) ) {
                 $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id );
-                $classes[] = 'tag-' . $tags->term_id;               
+                $classes[] = 'tag-' . $tags->term_id;
             }
         } elseif ( is_tax() ) {

trunk/wp-includes/query.php

@@ -2775 +2775 @@
         if ( $this->posts ) {
             $this->post_count = count( $this->posts );
-            
+
             $this->posts = array_map( 'get_post', $this->posts );
 
@@ -2781 +2781 @@
                 update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 
-            $this->post = reset( $this->posts );            
+            $this->post = reset( $this->posts );
         } else {
             $this->post_count = 0;

trunk/wp-includes/taxonomy.php

@@ -332 +332 @@
     $args = wp_parse_args($args, $defaults);
 
-    if ( strlen( $taxonomy ) > 32 ) 
+    if ( strlen( $taxonomy ) > 32 )
         return new WP_Error( 'taxonomy_too_long', __( 'Taxonomies cannot exceed 32 characters in length' ) );
 

trunk/wp-includes/template.php

@@ -314 +314 @@
     global $posts;
 
-    if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) { 
+    if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
         $type = explode( '/', $posts[0]->post_mime_type );