Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pinking shears 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-10-24 19:13:23 +00:00
parent ad3eb8f7ab
commit 62afab8db3
26 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/ie-rtl.dev.css
View File

@ -126,7 +126,7 @@ form#widgets-filter { /* fix widget page */
position: static;
}
/* nav menus
/* nav menus
.menu-max-depth-0 #menu-management { width: 460px; }
.menu-max-depth-1 #menu-management { width: 490px; }
.menu-max-depth-2 #menu-management { width: 520px; }

8
wp-admin/edit-form-advanced.php
View File

@ -212,23 +212,23 @@ if ( 'post' == $post_type ) {
} elseif ( 'page' == $post_type ) {
$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',
'title' => __('About Pages'),
'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',
'title' => __('Page Attributes'),
'content' => $page_attributes,
) );
$current_screen->add_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
'<p>' . __('<a href="http://codex.wordpress.org/Pages_Add_New_Screen" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .

4
wp-admin/edit-tags.php
View File

@ -143,8 +143,8 @@ case 'editedtag':
if ( !current_user_can( $tax->cap->edit_terms ) )
wp_die( __( 'Cheatin&#8217; 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&#8217;t exist. Perhaps it was deleted?' ) );

4
wp-admin/includes/class-wp-posts-list-table.php
View File

@ -864,7 +864,7 @@ class WP_Posts_List_Table extends WP_List_Table {
<?php
endif; // hierarchical
if ( !$bulk ) : ?>
<label>
@ -996,7 +996,7 @@ class WP_Posts_List_Table extends WP_List_Table {
</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] ) ) :
$all_post_formats = get_post_format_strings(); ?>

2
wp-admin/includes/class-wp-upgrader.php
View File

@ -1539,7 +1539,7 @@ class File_Upload_Upgrader {
$this->id = (int) $_GET[$urlholder];
$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;
$this->package = get_attached_file( $attachment->ID );

2
wp-admin/includes/deprecated.php
View File

@ -710,7 +710,7 @@ function wp_dashboard_quick_press_output() {
*/
function wp_tiny_mce() {
_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
wp_editor('', 'content');
}

2
wp-admin/includes/file.php
View File

@ -347,7 +347,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) {
$new_file = $uploads['path'] . "/$filename";
copy( $tmp_file, $new_file );
unlink($tmp_file);
// Set correct file permissions
$stat = stat( dirname( $new_file ));
$perms = $stat['mode'] & 0000666;

4
wp-admin/includes/media.php
View File

@ -1363,7 +1363,7 @@ wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
<?php do_action('post-html-upload-ui'); ?>
</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>
<?php
@ -2004,7 +2004,7 @@ function media_upload_max_image_resize() {
printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
?>
</label></p>
<?php
<?php
}
add_action( 'post-upload-ui', 'media_upload_max_image_resize' );

2
wp-admin/includes/post.php
View File

@ -598,7 +598,7 @@ function wp_write_post() {
* Calls wp_write_post() and handles the errors.
*
* @since 2.0.0
* @uses wp_write_post()
* @uses is_wp_error()
* @uses wp_die()

22
wp-admin/includes/screen.php
View File

@ -333,7 +333,7 @@ final class WP_Screen {
* @access private
*/
private $_help_tabs = array();
/**
* The help sidebar data associated with screen, if any.
*
@ -395,10 +395,10 @@ final class WP_Screen {
* @return WP_Screen Screen object.
*/
public function get( $hook_name = '' ) {
if ( is_a( $hook_name, 'WP_Screen' ) )
return $hook_name;
$action = $post_type = $taxonomy = '';
if ( $hook_name ) {
@ -425,12 +425,12 @@ final class WP_Screen {
$action = 'add';
$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 ) {
switch ( $base ) {
@ -466,7 +466,7 @@ final class WP_Screen {
break;
}
}
switch ( $base ) {
case 'post' :
if ( ! $post_type )
@ -484,7 +484,7 @@ final class WP_Screen {
$id = 'edit-' . $taxonomy;
break;
}
if ( is_network_admin() ) {
$id .= '-network';
$base .= '-network';
@ -492,7 +492,7 @@ final class WP_Screen {
$id .= '-user';
$base .= '-user';
}
if ( isset( self::$_registry[ $id ] ) )
return self::$_registry[ $id ];
@ -509,7 +509,7 @@ final class WP_Screen {
return $screen;
}
/**
* Makes the screen object the current screen.
*
@ -543,7 +543,7 @@ final class WP_Screen {
* @param string $help Help text.
*/
static function add_old_compat_help( $screen, $help ) {
self::$_old_compat_help[ $screen->id ] = $help;
self::$_old_compat_help[ $screen->id ] = $help;
}
/**

2
wp-admin/js/common.dev.js
View File

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

12
wp-admin/js/editor.dev.js
View File

@ -1,10 +1,10 @@
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() )
return false;
@ -14,7 +14,7 @@ var switchEditors = {
if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
txtarea_el.value = t.wpautop( txtarea_el.value );
if ( ed ) {
ed.show();
} else {
@ -25,12 +25,12 @@ var switchEditors = {
dom.removeClass(wrap_id, 'html-active');
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';
ed.hide();
@ -42,7 +42,7 @@ var switchEditors = {
}
return false;
},
_wp_Nop : function(content) {
var blocklist1, blocklist2;

2
wp-admin/network.php
View File

@ -523,7 +523,7 @@ if ( $_POST ) {
// create network tables
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 );
if ( is_wp_error( $result ) ) {

8
wp-admin/press-this.php
View File

@ -578,10 +578,10 @@ var photostorage = false;
if ( $url ) {
$content .= '<p>';
if ( $selection )
$content .= __('via ');
$content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
}
@ -602,7 +602,7 @@ var photostorage = false;
}
wp_editor( $content, 'content', $editor_settings );
?>
</div>
</div>
@ -619,7 +619,7 @@ var photostorage = false;
<td><input type="button" class="button" onclick="image_selector()" value="<?php esc_attr_e('Insert Image'); ?>" /></td>
</tr></table>
</div>
<?php
<?php
do_action('admin_footer');
do_action('admin_print_footer_scripts');
?>

8
wp-admin/update-core.php
View File

@ -12,7 +12,7 @@ require_once('./admin.php');
wp_enqueue_style( 'plugin-install' );
wp_enqueue_script( 'plugin-install' );
add_thickbox();
if ( is_multisite() && ! is_network_admin() ) {
wp_redirect( network_admin_url( 'update-core.php' ) );
exit();
@ -250,11 +250,11 @@ function list_plugin_updates() {
} else {
$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'>
<th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>

6
wp-includes/class-http.php
View File

@ -1626,12 +1626,12 @@ class WP_Http_Encoding {
* Decompression of deflated string while staying compatible with the majority of servers.
*
* 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
*
* @since 2.8.1

2
wp-includes/class-wp-editor.php
View File

@ -375,7 +375,7 @@ class WP_Editor {
elseif ( ($key = array_search('fullscreen', $mce_buttons_2)) !== false )
$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';
}

4
wp-includes/functions.php
View File

@ -2826,10 +2826,10 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
nocache_headers();
header( 'Content-Type: text/html; charset=utf-8' );
}
if ( empty($title) )
$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
$text_direction = 'ltr';
if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
$text_direction = 'rtl';

2
wp-includes/functions.wp-scripts.php
View File

@ -77,7 +77,7 @@ function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_f
* The $data array is JSON encoded. If called more than once for the same $handle with the same $name,
* 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()
*/

2
wp-includes/functions.wp-styles.php
View File

@ -44,7 +44,7 @@ function wp_print_styles( $handles = false ) {
* Accepts a string $data containing the CSS. If two or more CSS code blocks are
* 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()
*/

4
wp-includes/link-template.php
View File

@ -1128,7 +1128,7 @@ function get_adjacent_post( $in_same_cat = false, $excluded_categories = '', $pr
}
$excluded_categories = array_map( 'intval', $excluded_categories );
if ( ! empty( $cat_array ) ) {
$excluded_categories = array_diff($excluded_categories, $cat_array);
$posts_in_ex_cats_sql = '';
@ -1276,7 +1276,7 @@ function get_boundary_post( $in_same_cat = false, $excluded_categories = '', $st
$cat_array = array();
if( ! is_array( $excluded_categories ) )
$excluded_categories = explode( ',', $excluded_categories );
if ( $in_same_cat || ! empty( $excluded_categories ) ) {
if ( $in_same_cat )
$cat_array = wp_get_object_terms( $post->ID, 'category', array( 'fields' => 'ids' ) );

2
wp-includes/meta.php
View File

@ -307,7 +307,7 @@ function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
*
* @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.
*/
function metadata_exists( $meta_type, $object_id, $meta_key ) {

4
wp-includes/post.php
View File

@ -1040,7 +1040,7 @@ function register_post_type($post_type, $args = array()) {
}
do_action( 'registered_post_type', $post_type, $args );
return $args;
}
@ -5308,7 +5308,7 @@ add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
/**
* 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
* @param string $old_status

4
wp-includes/taxonomy.php
View File

@ -2854,7 +2854,7 @@ function _update_post_term_count( $terms, $taxonomy ) {
global $wpdb;
$object_types = (array) $taxonomy->object_type;
foreach ( $object_types as &$object_type )
list( $object_type ) = explode( ':', $object_type );
@ -2878,7 +2878,7 @@ function _update_post_term_count( $terms, $taxonomy ) {
if ( $object_types )
$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 ) );
do_action( 'edited_term_taxonomy', $term, $taxonomy );

2
wp-includes/update.php
View File

@ -330,7 +330,7 @@ function wp_get_update_data() {
$update_title[] = sprintf(_n('%d Theme Update', '%d Theme Updates', $counts['themes']), $counts['themes']);
$update_title = ! empty( $update_title ) ? esc_attr( implode( ', ', $update_title ) ) : '';
return array( 'counts' => $counts, 'title' => $update_title );
}

2
wp-includes/widgets.php
View File

@ -1150,7 +1150,7 @@ function _get_widget_id_base($id) {
*
* @access private
* @since 3.3
*/
*/
function _wp_sidebars_changed() {
global $sidebars_widgets;