From 8c114f0c544775655d8982c761e6c8a686e8e521 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 3 May 2012 16:41:59 +0000 Subject: [PATCH] Pinking shears git-svn-id: http://core.svn.wordpress.org/trunk@20715 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/meta-boxes.php | 6 +++--- wp-admin/includes/post.php | 2 +- wp-admin/includes/screen.php | 2 +- wp-admin/includes/update.php | 2 +- wp-admin/index.php | 2 +- wp-admin/install.php | 2 +- wp-includes/class-phpmailer.php | 4 ++-- wp-includes/class-simplepie.php | 2 +- wp-includes/class-wp-atom-server.php | 4 ++-- wp-includes/class-wp-theme.php | 2 +- wp-includes/class-wp-xmlrpc-server.php | 2 +- wp-includes/deprecated.php | 2 +- wp-includes/functions.php | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 60f0a0cab..ed4c55b1e 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -665,7 +665,7 @@ function link_categories_meta_box($link) {
    • - +
    - + - +

    ' . __( 'Documentation on Dashboard' ) . '

    ' . '

    ' . __( 'Support Forums' ) . '

    ' ); - + include (ABSPATH . 'wp-admin/admin-header.php'); $today = current_time('mysql', 1); diff --git a/wp-admin/install.php b/wp-admin/install.php index 6e3751646..e39d1f4fc 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -163,7 +163,7 @@ if ( !$mysql_compat || !$php_compat ) { } if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { - display_header(); + display_header(); die( '

    ' . __( 'Configuration Error' ) . '

    ' . __( 'Your wp-config.php file has an empty database table prefix, which is not supported.' ) . '

    ' ); } diff --git a/wp-includes/class-phpmailer.php b/wp-includes/class-phpmailer.php index 4b7598df1..ba4ddb2eb 100644 --- a/wp-includes/class-phpmailer.php +++ b/wp-includes/class-phpmailer.php @@ -1643,7 +1643,7 @@ class PHPMailer { if (version_compare(PHP_VERSION, '5.3.0', '<')) { set_magic_quotes_runtime(0); } else { - ini_set('magic_quotes_runtime', 0); + ini_set('magic_quotes_runtime', 0); } } $file_buffer = file_get_contents($path); @@ -1652,7 +1652,7 @@ class PHPMailer { if (version_compare(PHP_VERSION, '5.3.0', '<')) { set_magic_quotes_runtime($magic_quotes); } else { - ini_set('magic_quotes_runtime', $magic_quotes); + ini_set('magic_quotes_runtime', $magic_quotes); } } return $file_buffer; diff --git a/wp-includes/class-simplepie.php b/wp-includes/class-simplepie.php index 29201e199..6128495d8 100644 --- a/wp-includes/class-simplepie.php +++ b/wp-includes/class-simplepie.php @@ -2775,7 +2775,7 @@ class SimplePie function get_latitude() { - + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat')) { return (float) $return[0]['data']; diff --git a/wp-includes/class-wp-atom-server.php b/wp-includes/class-wp-atom-server.php index 0f046a986..d3816732c 100644 --- a/wp-includes/class-wp-atom-server.php +++ b/wp-includes/class-wp-atom-server.php @@ -346,7 +346,7 @@ EOD; $post_content = ''; $post_excerpt = ''; $pubtimes = ''; - + if ( isset( $entry->title ) && is_array( $entry->title ) && !empty( $entry->title[1] ) ) $post_title = (string) $entry->title[1]; if ( isset( $entry->content ) && is_array( $entry->content ) && !empty( $entry->content[1] ) ) @@ -355,7 +355,7 @@ EOD; $post_excerpt = (string) $entry->summary[1]; if ( !empty( $entry->published ) ) $pubtimes = (string) $entry->published; - + $pubtimes = $this->get_publish_time( $pubtimes ); $post_date = $pubtimes[0]; diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php index d37551cf8..1515a69b0 100644 --- a/wp-includes/class-wp-theme.php +++ b/wp-includes/class-wp-theme.php @@ -372,7 +372,7 @@ final class WP_Theme implements ArrayAccess { * Method to implement ArrayAccess for keys formerly returned by get_themes(). * * Author, Author Name, Author URI, and Description did not previously return - * translated data. We are doing so now as it is safe to do. However, as + * translated data. We are doing so now as it is safe to do. However, as * Name and Title could have been used as the key for get_themes(), both remain * untranslated for back compatibility. This means that ['Name'] is not ideal, * and care should be taken to use $theme->display('Name') to get a properly diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php index a2b9f95f3..0c12307b7 100644 --- a/wp-includes/class-wp-xmlrpc-server.php +++ b/wp-includes/class-wp-xmlrpc-server.php @@ -3275,7 +3275,7 @@ class wp_xmlrpc_server extends IXR_Server { $post_data = wp_get_single_post($post_ID, ARRAY_A); if ( ! $post_data ) return new IXR_Error( 404, __( 'Invalid post ID.' ) ); - + if ( !current_user_can( 'edit_post', $post_ID ) ) return new IXR_Error( 401, __( 'Sorry, you cannot edit this post.' ) ); diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index f5b6521c5..24034f994 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -2996,7 +2996,7 @@ function get_current_theme() { */ function clean_pre($matches) { _deprecated_function( __FUNCTION__, '3.4' ); - + if ( is_array($matches) ) $text = $matches[1] . $matches[2] . ""; else diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 4b4b3f4c1..24e1a29c8 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -3686,7 +3686,7 @@ function _device_can_upload() { return true; $ua = $_SERVER['HTTP_USER_AGENT']; - + if ( strpos($ua, 'iPhone') !== false || strpos($ua, 'iPad') !== false || strpos($ua, 'iPod') !== false ) {