Compare commits

..

5 Commits

Author SHA1 Message Date
Aaron Campbell
ff9bb42e14 Tag 3.8.26
Built from https://develop.svn.wordpress.org/tags/3.8.26@42957


git-svn-id: http://core.svn.wordpress.org/tags/3.8.26@42787 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 22:42:56 +00:00
Aaron Campbell
3b5b5eb1c6 Bump 3.8 branch to version 3.8.26
Built from https://develop.svn.wordpress.org/branches/3.8@42944


git-svn-id: http://core.svn.wordpress.org/branches/3.8@42774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 20:32:35 +00:00
Dominik Schilling
4fe01b7a00 Template: Make sure the version string is correctly escaped for use in attributes.
Merge of [42893] to the 3.8 branch.

Built from https://develop.svn.wordpress.org/branches/3.8@42928


git-svn-id: http://core.svn.wordpress.org/branches/3.8@42758 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 16:11:34 +00:00
Dominik Schilling
34e08327d5 Login: Use wp_safe_redirect() when redirecting the login page if forced to use HTTPS.
Merge of [42892] to the 3.8 branch.

Built from https://develop.svn.wordpress.org/branches/3.8@42906


git-svn-id: http://core.svn.wordpress.org/branches/3.8@42736 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-03 15:34:38 +00:00
Sergey Biryukov
48b8d8182b General: Update copyright year to 2018 in license.txt.
Props rachelbaker.
Merges [42424] to the 3.8 branch.
Fixes #43007.
Built from https://develop.svn.wordpress.org/branches/3.8@42563


git-svn-id: http://core.svn.wordpress.org/branches/3.8@42392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-23 11:30:39 +00:00
5 changed files with 16 additions and 12 deletions

View File

@@ -1,6 +1,6 @@
WordPress - Web publishing software
Copyright 2017 by the contributors
Copyright 2018 by the contributors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

View File

@@ -39,7 +39,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', 25 ); ?></h3>
<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 26 ); ?></h3>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
'<strong>Version %1$s</strong> addressed some security issues.', 2 ), '3.8.26' ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.8.26' ); ?>
</p>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue.',
'<strong>Version %1$s</strong> addressed some security issues.', 1 ), '3.8.25' ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_3.8.25' ); ?>

View File

@@ -2320,25 +2320,25 @@ function get_the_generator( $type = '' ) {
switch ( $type ) {
case 'html':
$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';
$gen = '<meta name="generator" content="WordPress ' . esc_attr( get_bloginfo( 'version' ) ) . '">';
break;
case 'xhtml':
$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />';
$gen = '<meta name="generator" content="WordPress ' . esc_attr( get_bloginfo( 'version' ) ) . '" />';
break;
case 'atom':
$gen = '<generator uri="http://wordpress.org/" version="' . get_bloginfo_rss( 'version' ) . '">WordPress</generator>';
$gen = '<generator uri="https://wordpress.org/" version="' . esc_attr( get_bloginfo_rss( 'version' ) ) . '">WordPress</generator>';
break;
case 'rss2':
$gen = '<generator>http://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '</generator>';
$gen = '<generator>' . esc_url_raw( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '</generator>';
break;
case 'rdf':
$gen = '<admin:generatorAgent rdf:resource="http://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '" />';
$gen = '<admin:generatorAgent rdf:resource="' . esc_url_raw( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '" />';
break;
case 'comment':
$gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
$gen = '<!-- generator="WordPress/' . esc_attr( get_bloginfo( 'version' ) ) . '" -->';
break;
case 'export':
$gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
$gen = '<!-- generator="WordPress/' . esc_attr( get_bloginfo_rss( 'version' ) ) . '" created="' . date( 'Y-m-d H:i' ) . '" -->';
break;
}
return apply_filters( "get_the_generator_{$type}", $gen, $type );

View File

@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '3.8.25';
$wp_version = '3.8.26';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

View File

@@ -14,10 +14,10 @@ require( dirname(__FILE__) . '/wp-load.php' );
// Redirect to https login if forced to use SSL
if ( force_ssl_admin() && ! is_ssl() ) {
if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
wp_safe_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
exit();
} else {
wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
wp_safe_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
exit();
}
}