From 1132430022383fdf47fa6cb9377300fd885297aa Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 3 May 2015 11:52:35 -0700 Subject: [PATCH] WordPress 4.1.3 Signed-off-by: Edward Z. Yang --- readme.html | 2 +- wp-admin/about.php | 6 +++++- wp-includes/version.php | 2 +- wp-includes/wp-db.php | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/readme.html b/readme.html index 16cc8e96..09f0376e 100644 --- a/readme.html +++ b/readme.html @@ -9,7 +9,7 @@

WordPress -
Version 4.1.2 +
Version 4.1.3

Semantic Personal Publishing Platform

diff --git a/wp-admin/about.php b/wp-admin/about.php index f1c263b8..b0ec9a43 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -42,7 +42,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

+

+

Version %1$s addressed %2$s bug.', + 'Version %1$s addressed %2$s bugs.', 1 ), '4.1.3', number_format_i18n( 1 ) ); ?> + the release notes.' ), 'http://codex.wordpress.org/Version_4.1.3' ); ?> +

Version %1$s addressed a security issue.', 'Version %1$s addressed some security issues.', 8 ), '4.1.2' ); ?> the release notes.' ), 'http://codex.wordpress.org/Version_4.1.2' ); ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 74198053..b3bb8584 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1.2'; +$wp_version = '4.1.3'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 76c41d8b..b3eed896 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -2517,6 +2517,7 @@ class wpdb { // Split the CONVERT() calls by charset, so we can make sure the connection is right $queries[ $value['charset'] ][ $col ] = $this->prepare( "CONVERT( %s USING {$value['charset']} )", $value['value'] ); + unset( $data[ $col ]['db'] ); } } -- 2.44.0