]> scripts.mit.edu Git - autoinstalls/wordpress.git/commitdiff
scripts.mit.edu / autoinstalls / wordpress.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5d244c8)
WordPress 4.1.3 wordpress-4.1.3
authorEdward Z. Yang <ezyang@cs.stanford.edu>
Sun, 3 May 2015 18:52:35 +0000 (11:52 -0700)
committerEdward Z. Yang <ezyang@cs.stanford.edu>
Sun, 3 May 2015 18:52:35 +0000 (11:52 -0700)
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
readme.html patch | blob | history
wp-admin/about.php patch | blob | history
wp-includes/version.php patch | blob | history
wp-includes/wp-db.php patch | blob | history

diff --git a/readme.html b/readme.html
index 16cc8e9610d965157b2226be4b07fcd892b0f80f..09f0376eb253447dee335cee4bdde77aa77668a5 100644 (file)
--- a/readme.html
+++ b/readme.html
@@ -9,7 +9,7 @@
 <body>
 <h1 id="logo">
        <a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
-       <br /> Version 4.1.2
+       <br /> Version 4.1.3
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 
diff --git a/wp-admin/about.php b/wp-admin/about.php
index f1c263b85431bb19d202cf103e7d87416f4a5d2b..b0ec9a436614704898c1ca4009f535a0ec45012e 100644 (file)
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -42,7 +42,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 </h2>
 
 <div class="changelog point-releases">
-       <h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 2 ); ?></h3>
+       <h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 3 ); ?></h3>
+       <p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed %2$s bugs.', 1 ), '4.1.3', number_format_i18n( 1 ) ); ?>
+               <?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_4.1.3' ); ?>
+       </p>
        <p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
          '<strong>Version %1$s</strong> addressed some security issues.', 8 ), '4.1.2' ); ?>
                <?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_4.1.2' ); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 74198053a5f53a868d3da7f12a5fafe828352962..b3bb8584a3ec8ac5bc50c6e42a92cdd995fc2961 100644 (file)
--- 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 76c41d8bbca4018817ef4f1b26caf63dc37a40bb..b3eed896ec4d5915b8ad51ac69d7ed6d409c54a4 100644 (file)
--- 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'] );
                                }
                        }
 
WordPress autoinstaller for phpBB