Changeset 19054
- Timestamp:
- 10/24/2011 07:13:23 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/css/ie-rtl.dev.css
r18975 r19054 127 127 } 128 128 129 /* nav menus 129 /* nav menus 130 130 .menu-max-depth-0 #menu-management { width: 460px; } 131 131 .menu-max-depth-1 #menu-management { width: 490px; } -
trunk/wp-admin/edit-form-advanced.php
r19013 r19054 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 “Parent” of the other, creating a group of Pages.') . '</p>' . 214 214 '<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 216 216 $current_screen->add_help_tab( array( 217 217 'id' => 'about-pages', … … 219 219 'content' => $about_pages, 220 220 ) ); 221 221 222 222 $page_attributes = '<p>' . __('<strong>Parent</strong> - You can arrange your pages in hierarchies. For example, you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how many levels you can nest pages.') . '</p>' . 223 223 '<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’ll see them in this dropdown menu.') . '</p>' . 224 224 '<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 226 226 $current_screen->add_help_tab( array( 227 227 'id' => 'page-attributes', … … 229 229 'content' => $page_attributes, 230 230 ) ); 231 231 232 232 $current_screen->add_help_sidebar( 233 233 '<p><strong>' . __('For more information:') . '</strong></p>' . -
trunk/wp-admin/edit-tags.php
r18990 r19054 144 144 if ( !current_user_can( $tax->cap->edit_terms ) ) 145 145 wp_die( __( 'Cheatin’ uh?' ) ); 146 147 $tag = get_term( $tag_ID, $taxonomy ); 146 147 $tag = get_term( $tag_ID, $taxonomy ); 148 148 if ( ! $tag ) 149 149 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
r19047 r19054 865 865 <?php 866 866 endif; // hierarchical 867 867 868 868 if ( !$bulk ) : ?> 869 869 … … 997 997 </div> 998 998 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' ) ) : 1000 1000 $post_formats = get_theme_support( 'post-formats' ); 1001 1001 if ( isset( $post_formats[0] ) && is_array( $post_formats[0] ) ) : -
trunk/wp-admin/includes/class-wp-upgrader.php
r18632 r19054 1540 1540 $attachment = get_post( $this->id ); 1541 1541 if ( empty($attachment) ) 1542 wp_die(__('Please select a file')); 1542 wp_die(__('Please select a file')); 1543 1543 1544 1544 $this->filename = $attachment->post_title; -
trunk/wp-admin/includes/deprecated.php
r19050 r19054 711 711 function wp_tiny_mce() { 712 712 _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' ); 713 713 714 714 wp_editor('', 'content'); 715 715 } -
trunk/wp-admin/includes/file.php
r18841 r19054 348 348 copy( $tmp_file, $new_file ); 349 349 unlink($tmp_file); 350 350 351 351 // Set correct file permissions 352 352 $stat = stat( dirname( $new_file )); -
trunk/wp-admin/includes/media.php
r19046 r19054 1364 1364 </div> 1365 1365 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]) ); ?> 1367 1367 <?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p> 1368 1368 … … 2005 2005 ?> 2006 2006 </label></p> 2007 <?php 2007 <?php 2008 2008 } 2009 2009 -
trunk/wp-admin/includes/post.php
r18847 r19054 599 599 * 600 600 * @since 2.0.0 601 601 602 602 * @uses wp_write_post() 603 603 * @uses is_wp_error() -
trunk/wp-admin/includes/screen.php
r19053 r19054 334 334 */ 335 335 private $_help_tabs = array(); 336 336 337 337 /** 338 338 * The help sidebar data associated with screen, if any. … … 396 396 */ 397 397 public function get( $hook_name = '' ) { 398 398 399 399 if ( is_a( $hook_name, 'WP_Screen' ) ) 400 400 return $hook_name; 401 401 402 402 $action = $post_type = $taxonomy = ''; 403 403 … … 426 426 $id = str_replace( array( '-new', '-add' ), '', $id ); 427 427 } 428 428 429 429 if ( 'index' == $id ) 430 430 $id = 'dashboard'; 431 431 432 432 $base = $id; 433 433 434 434 // If this is the current screen, see if we can be more accurate for post types and taxonomies. 435 435 if ( ! $hook_name ) { … … 467 467 } 468 468 } 469 469 470 470 switch ( $base ) { 471 471 case 'post' : … … 485 485 break; 486 486 } 487 487 488 488 if ( is_network_admin() ) { 489 489 $id .= '-network'; … … 493 493 $base .= '-user'; 494 494 } 495 495 496 496 if ( isset( self::$_registry[ $id ] ) ) 497 497 return self::$_registry[ $id ]; … … 510 510 return $screen; 511 511 } 512 512 513 513 /** 514 514 * Makes the screen object the current screen. … … 544 544 */ 545 545 static function add_old_compat_help( $screen, $help ) { 546 self::$_old_compat_help[ $screen->id ] = $help; 546 self::$_old_compat_help[ $screen->id ] = $help; 547 547 } 548 548 -
trunk/wp-admin/js/common.dev.js
r19045 r19054 143 143 144 144 columns.height('auto'); 145 145 146 146 height = Math.max.apply( null, $.map( columns, function( el ) { return $(el).height(); }) ); 147 147 columns.height( height ); -
trunk/wp-admin/js/editor.dev.js
r18576 r19054 1 1 2 2 var switchEditors = { 3 3 4 4 go: function(a) { 5 5 var t = this, aid = a.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4), 6 6 ed = tinyMCE.get(id), wrap_id = 'wp-'+id+'-wrap', dom = tinymce.DOM, txtarea_el = dom.get(id); 7 7 8 8 if ( 'tmce' == mode ) { 9 9 if ( ed && ! ed.isHidden() ) … … 15 15 if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop ) 16 16 txtarea_el.value = t.wpautop( txtarea_el.value ); 17 17 18 18 if ( ed ) { 19 19 ed.show(); … … 26 26 dom.addClass(wrap_id, 'tmce-active'); 27 27 setUserSetting('editor', 'tinymce'); 28 28 29 29 } else if ( 'html' == mode ) { 30 30 31 31 if ( ed && ed.isHidden() ) 32 32 return false; 33 33 34 34 if ( ed ) { 35 35 txtarea_el.style.height = ed.getContentAreaContainer().offsetHeight + 20 + 'px'; … … 43 43 return false; 44 44 }, 45 45 46 46 _wp_Nop : function(content) { 47 47 var blocklist1, blocklist2; -
trunk/wp-admin/network.php
r19018 r19054 524 524 install_network(); 525 525 $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; 527 527 if ( ! network_domain_check() ) { 528 528 $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 579 579 if ( $url ) { 580 580 $content .= '<p>'; 581 581 582 582 if ( $selection ) 583 583 $content .= __('via '); 584 584 585 585 $content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) ); 586 586 } … … 603 603 604 604 wp_editor( $content, 'content', $editor_settings ); 605 605 606 606 ?> 607 607 </div> … … 620 620 </tr></table> 621 621 </div> 622 <?php 622 <?php 623 623 do_action('admin_footer'); 624 624 do_action('admin_print_footer_scripts'); -
trunk/wp-admin/update-core.php
r19003 r19054 13 13 wp_enqueue_script( 'plugin-install' ); 14 14 add_thickbox(); 15 15 16 16 if ( is_multisite() && ! is_network_admin() ) { 17 17 wp_redirect( network_admin_url( 'update-core.php' ) ); … … 251 251 $upgrade_notice = ''; 252 252 } 253 253 254 254 $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); 256 256 $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 258 258 echo " 259 259 <tr class='active'> -
trunk/wp-includes/class-http.php
r19000 r19054 1627 1627 * 1628 1628 * 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. 1631 1631 * 1632 1632 * Warning: Magic numbers within. Due to the potential different formats that the compressed 1633 1633 * 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: 1635 1635 * http://core.trac.wordpress.org/ticket/18273 1636 1636 * -
trunk/wp-includes/class-wp-editor.php
r19028 r19054 376 376 $mce_buttons_2[$key] = 'wp_fullscreen'; 377 377 elseif ( ($key = array_search('fullscreen', $mce_buttons_3)) !== false ) 378 $mce_buttons_3[$key] = 'wp_fullscreen'; 378 $mce_buttons_3[$key] = 'wp_fullscreen'; 379 379 elseif ( ($key = array_search('fullscreen', $mce_buttons_4)) !== false ) 380 380 $mce_buttons_4[$key] = 'wp_fullscreen'; -
trunk/wp-includes/functions.php
r19044 r19054 2827 2827 header( 'Content-Type: text/html; charset=utf-8' ); 2828 2828 } 2829 2829 2830 2830 if ( empty($title) ) 2831 2831 $title = $have_gettext ? __('WordPress › Error') : 'WordPress › Error'; 2832 2832 2833 2833 $text_direction = 'ltr'; 2834 2834 if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] ) -
trunk/wp-includes/functions.wp-scripts.php
r18561 r19054 78 78 * the object would contain all values. In that case if two or more keys are the same, 79 79 * the last value overwrites the previous. The function is named "localize_script" because of historical reasons. 80 * 80 * 81 81 * @since r16 82 82 * @see WP_Scripts::add_script_data() -
trunk/wp-includes/functions.wp-styles.php
r18561 r19054 45 45 * added to the same stylesheet $handle, they will be printed in the order 46 46 * they were added, i.e. the latter added styles can redeclare the previous. 47 * 47 * 48 48 * @since 3.3 49 49 * @see WP_Scripts::add_inline_style() -
trunk/wp-includes/link-template.php
r18827 r19054 1129 1129 1130 1130 $excluded_categories = array_map( 'intval', $excluded_categories ); 1131 1131 1132 1132 if ( ! empty( $cat_array ) ) { 1133 1133 $excluded_categories = array_diff($excluded_categories, $cat_array); … … 1277 1277 if( ! is_array( $excluded_categories ) ) 1278 1278 $excluded_categories = explode( ',', $excluded_categories ); 1279 1279 1280 1280 if ( $in_same_cat || ! empty( $excluded_categories ) ) { 1281 1281 if ( $in_same_cat ) -
trunk/wp-includes/meta.php
r18835 r19054 308 308 * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) 309 309 * @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. 311 311 * @return boolean true of the key is set, false if not. 312 312 */ -
trunk/wp-includes/post.php
r19034 r19054 1041 1041 1042 1042 do_action( 'registered_post_type', $post_type, $args ); 1043 1043 1044 1044 return $args; 1045 1045 } … … 5309 5309 /** 5310 5310 * 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 * 5312 5312 * @access private 5313 5313 * @param string $new_status -
trunk/wp-includes/taxonomy.php
r19037 r19054 2855 2855 2856 2856 $object_types = (array) $taxonomy->object_type; 2857 2857 2858 2858 foreach ( $object_types as &$object_type ) 2859 2859 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 ) ); 2880 2880 2881 2881 2882 2882 do_action( 'edit_term_taxonomy', $term, $taxonomy ); 2883 2883 $wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) ); -
trunk/wp-includes/update.php
r19022 r19054 331 331 332 332 $update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : ''; 333 333 334 334 return array( 'counts' => $counts, 'title' => $update_title ); 335 335 } -
trunk/wp-includes/widgets.php
r18995 r19054 1151 1151 * @access private 1152 1152 * @since 3.3 1153 */ 1153 */ 1154 1154 function _wp_sidebars_changed() { 1155 1155 global $sidebars_widgets;
Note: See TracChangeset
for help on using the changeset viewer.