Changeset 19054

Timestamp:

10/24/2011 07:13:23 PM (15 years ago)

Author:

ryan

Message:

Pinking shears

Location:

trunk

Files:

• wp-admin/css/ie-rtl.dev.css (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (3 diffs)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/deprecated.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/screen.php (modified) (8 diffs)
• wp-admin/js/common.dev.js (modified) (1 diff)
• wp-admin/js/editor.dev.js (modified) (4 diffs)
• wp-admin/network.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (3 diffs)
• wp-admin/update-core.php (modified) (2 diffs)
• wp-includes/class-http.php (modified) (1 diff)
• wp-includes/class-wp-editor.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/functions.wp-scripts.php (modified) (1 diff)
• wp-includes/functions.wp-styles.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (2 diffs)
• wp-includes/meta.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (2 diffs)
• wp-includes/update.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (1 diff)

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

@@ -127 +127 @@
 }
 
-/* nav menus 
+/* nav menus
 .menu-max-depth-0 #menu-management { width: 460px; }
 .menu-max-depth-1 #menu-management { width: 490px; }

trunk/wp-admin/edit-form-advanced.php

@@ -213 +213 @@
         $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>' .
                 '<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>';
-        
+
         $current_screen->add_help_tab( array(
                 'id'      => 'about-pages',
@@ -219 +219 @@
                 'content' => $about_pages,
         ) );
-        
+
         $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>' .
                 '<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>' .
                 '<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>';
-        
+
         $current_screen->add_help_tab( array(
                 'id' => 'page-attributes',
@@ -229 +229 @@
                 'content' => $page_attributes,
         ) );
-        
+
         $current_screen->add_help_sidebar(
                         '<p><strong>' . __('For more information:') . '</strong></p>' .

trunk/wp-admin/edit-tags.php

@@ -144 +144 @@
         if ( !current_user_can( $tax->cap->edit_terms ) )
                 wp_die( __( 'Cheatin’ uh?' ) );
- 
-        $tag = get_term( $tag_ID, $taxonomy ); 
+
+        $tag = get_term( $tag_ID, $taxonomy );
         if ( ! $tag )
                 wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -865 +865 @@
         <?php
                         endif; // hierarchical
-        
+
                         if ( !$bulk ) : ?>
 
@@ -997 +997 @@
                         </div>
 
-        <?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) : 
+        <?php if ( post_type_supports( $screen->post_type, 'post-formats' ) && current_theme_supports( 'post-formats' ) ) :
                 $post_formats = get_theme_support( 'post-formats' );
                 if ( isset( $post_formats[0] ) && is_array( $post_formats[0] ) ) :

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1540 +1540 @@
                         $attachment = get_post( $this->id );
                         if ( empty($attachment) )
-                                wp_die(__('Please select a file'));     
+                                wp_die(__('Please select a file'));
 
                         $this->filename = $attachment->post_title;

trunk/wp-admin/includes/deprecated.php

@@ -711 +711 @@
 function wp_tiny_mce() {
         _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
-        
+
         wp_editor('', 'content');
 }

trunk/wp-admin/includes/file.php

@@ -348 +348 @@
         copy( $tmp_file, $new_file );
         unlink($tmp_file);
-        
+
         // Set correct file permissions
         $stat = stat( dirname( $new_file ));

trunk/wp-admin/includes/media.php

@@ -1364 +1364 @@
 </div>
 
-<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?> 
+<p><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?>
 <?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
 
@@ -2005 +2005 @@
 ?>
 </label></p>
-<?php 
+<?php
 }
 

trunk/wp-admin/includes/post.php

@@ -599 +599 @@
  *
  * @since 2.0.0
- 
+
  * @uses wp_write_post()
  * @uses is_wp_error()

trunk/wp-admin/includes/screen.php

@@ -334 +334 @@
          */
         private $_help_tabs = array();
- 
+
         /**
          * The help sidebar data associated with screen, if any.
@@ -396 +396 @@
          */
         public function get( $hook_name = '' ) {
- 
+
                 if ( is_a( $hook_name, 'WP_Screen' ) )
                         return $hook_name;
- 
+
                 $action = $post_type = $taxonomy = '';
 
@@ -426 +426 @@
                         $id = str_replace( array( '-new', '-add' ), '', $id );
                 }
- 
+
                 if ( 'index' == $id )
                         $id = 'dashboard';
- 
+
                 $base = $id;
- 
+
                 // If this is the current screen, see if we can be more accurate for post types and taxonomies.
                 if ( ! $hook_name ) {
@@ -467 +467 @@
                         }
                 }
- 
+
                 switch ( $base ) {
                         case 'post' :
@@ -485 +485 @@
                                 break;
                 }
- 
+
                 if ( is_network_admin() ) {
                         $id   .= '-network';
@@ -493 +493 @@
                         $base .= '-user';
                 }
- 
+
                 if ( isset( self::$_registry[ $id ] ) )
                         return self::$_registry[ $id ];
@@ -510 +510 @@
                 return $screen;
         }
- 
+
         /**
          * Makes the screen object the current screen.
@@ -544 +544 @@
          */
         static function add_old_compat_help( $screen, $help ) {
-                self::$_old_compat_help[ $screen->id ] = $help; 
+                self::$_old_compat_help[ $screen->id ] = $help;
         }
 

trunk/wp-admin/js/common.dev.js

@@ -143 +143 @@
 
                 columns.height('auto');
-        
+
                 height = Math.max.apply( null, $.map( columns, function( el ) { return $(el).height(); }) );
                 columns.height( height );

trunk/wp-admin/js/editor.dev.js

@@ -1 +1 @@
 
 var switchEditors = {
-        
+
         go: function(a) {
                 var t = this, aid = a.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4),
                         ed = tinyMCE.get(id), wrap_id = 'wp-'+id+'-wrap', dom = tinymce.DOM, txtarea_el = dom.get(id);
-        
+
                 if ( 'tmce' == mode ) {
                         if ( ed && ! ed.isHidden() )
@@ -15 +15 @@
                         if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
                                 txtarea_el.value = t.wpautop( txtarea_el.value );
-                        
+
                         if ( ed ) {
                                 ed.show();
@@ -26 +26 @@
                         dom.addClass(wrap_id, 'tmce-active');
                         setUserSetting('editor', 'tinymce');
-        
+
                 } else if ( 'html' == mode ) {
 
                         if ( ed && ed.isHidden() )
                                 return false;
-                        
+
                         if ( ed ) {
                                 txtarea_el.style.height = ed.getContentAreaContainer().offsetHeight + 20 + 'px';
@@ -43 +43 @@
                 return false;
         },
-        
+
         _wp_Nop : function(content) {
                 var blocklist1, blocklist2;

trunk/wp-admin/network.php

@@ -524 +524 @@
         install_network();
         $hostname = get_clean_basedomain();
-        $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false; 
+        $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
         if ( ! network_domain_check() ) {
                 $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), stripslashes( $_POST['sitename'] ), $base, $subdomain_install );

trunk/wp-admin/press-this.php

@@ -579 +579 @@
                 if ( $url ) {
                         $content .= '<p>';
-                        
+
                         if ( $selection )
                                 $content .= __('via ');
-                        
+
                         $content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
                 }
@@ -603 +603 @@
 
                 wp_editor( $content, 'content', $editor_settings );
-                
+
                 ?>
                 </div>
@@ -620 +620 @@
         </tr></table>
 </div>
-<?php 
+<?php
 do_action('admin_footer');
 do_action('admin_print_footer_scripts');

trunk/wp-admin/update-core.php

@@ -13 +13 @@
 wp_enqueue_script( 'plugin-install' );
 add_thickbox();
-        
+
 if ( is_multisite() && ! is_network_admin() ) {
         wp_redirect( network_admin_url( 'update-core.php' ) );
@@ -251 +251 @@
                         $upgrade_notice = '';
                 }
-                
+
                 $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&TB_iframe=true&width=640&height=662');
-                $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version); 
+                $details_text = sprintf(__('View version %1$s details'), $plugin_data->update->new_version);
                 $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);
-                
+
                 echo "
         <tr class='active'>

trunk/wp-includes/class-http.php

@@ -1627 +1627 @@
          *
          * Certain Servers will return deflated data with headers which PHP's gziniflate()
-         * function cannot handle out of the box. The following function has been created from 
-         * various snippets on the gzinflate() PHP documentation. 
+         * function cannot handle out of the box. The following function has been created from
+         * various snippets on the gzinflate() PHP documentation.
          *
          * Warning: Magic numbers within. Due to the potential different formats that the compressed
          * data may be returned in, some "magic offsets" are needed to ensure proper decompression
-         * takes place. For a simple progmatic way to determine the magic offset in use, see: 
+         * takes place. For a simple progmatic way to determine the magic offset in use, see:
          * http://core.trac.wordpress.org/ticket/18273
          *

trunk/wp-includes/class-wp-editor.php

@@ -376 +376 @@
                                         $mce_buttons_2[$key] = 'wp_fullscreen';
                                 elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false )
-                                        $mce_buttons_3[$key] = 'wp_fullscreen'; 
+                                        $mce_buttons_3[$key] = 'wp_fullscreen';
                                 elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false )
                                         $mce_buttons_4[$key] = 'wp_fullscreen';

trunk/wp-includes/functions.php

@@ -2827 +2827 @@
                         header( 'Content-Type: text/html; charset=utf-8' );
                 }
-        
+
                 if ( empty($title) )
                         $title = $have_gettext ? __('WordPress › Error') : 'WordPress › Error';
-        
+
                 $text_direction = 'ltr';
                 if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )

trunk/wp-includes/functions.wp-scripts.php

@@ -78 +78 @@
  * the object would contain all values. In that case if two or more keys are the same,
  * the last value overwrites the previous. The function is named "localize_script" because of historical reasons.
- * 
+ *
  * @since r16
  * @see WP_Scripts::add_script_data()

trunk/wp-includes/functions.wp-styles.php

@@ -45 +45 @@
  * added to the same stylesheet $handle, they will be printed in the order
  * they were added, i.e. the latter added styles can redeclare the previous.
- * 
+ *
  * @since 3.3
  * @see WP_Scripts::add_inline_style()

trunk/wp-includes/link-template.php

@@ -1129 +1129 @@
 
                         $excluded_categories = array_map( 'intval', $excluded_categories );
-                                
+
                         if ( ! empty( $cat_array ) ) {
                                 $excluded_categories = array_diff($excluded_categories, $cat_array);
@@ -1277 +1277 @@
         if( ! is_array( $excluded_categories ) )
                 $excluded_categories = explode( ',', $excluded_categories );
-                
+
         if ( $in_same_cat || ! empty( $excluded_categories ) ) {
                 if ( $in_same_cat )

trunk/wp-includes/meta.php

@@ -308 +308 @@
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
- * @param string $meta_key Metadata key. 
+ * @param string $meta_key Metadata key.
  * @return boolean true of the key is set, false if not.
  */

trunk/wp-includes/post.php

@@ -1041 +1041 @@
 
         do_action( 'registered_post_type', $post_type, $args );
-        
+
         return $args;
 }
@@ -5309 +5309 @@
 /**
  * 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.
- * 
+ *
  * @access private
  * @param string $new_status

trunk/wp-includes/taxonomy.php

@@ -2855 +2855 @@
 
         $object_types = (array) $taxonomy->object_type;
-        
+
         foreach ( $object_types as &$object_type )
                 list( $object_type ) = explode( ':', $object_type );
@@ -2879 +2879 @@
                         $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 ) );
 
-                
+
                 do_action( 'edit_term_taxonomy', $term, $taxonomy );
                 $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );

trunk/wp-includes/update.php

@@ -331 +331 @@
 
         $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
-        
+
         return array( 'counts' => $counts, 'title' => $update_title );
 }

trunk/wp-includes/widgets.php

@@ -1151 +1151 @@
  * @access private
  * @since 3.3
- */  
+ */
 function _wp_sidebars_changed() {
         global $sidebars_widgets;