...
 
Commits (8)
......@@ -3,4 +3,4 @@ Git repository with source code of [Bezirksblätter.cz](https://bezirksblaetter.
## Requirements
* [PHP](https://secure.php.net/) 7.3 or newer
* [WordPress](https://wordpress.org/) 4.9 or newer
* [WordPress](https://wordpress.org/) 5.4 or newer
......@@ -4,8 +4,7 @@
"Homepage redirect should include 'Vary: Accept-Language' header": "https://patch-diff.githubusercontent.com/raw/polylang/polylang/pull/459.diff"
},
"roots/wordpress": {
"$_SERVER['SERVER_NAME'] not a reliable when generating email host names": "patches/25239.r44770.patch",
"Connection error to WordPress.org when HTTP calls disabled": "patches/29719.bezirksblaetter.patch",
"$_SERVER['SERVER_NAME'] not a reliable when generating email host names": "patches/25239.r47544.patch",
"<link rel=canonical> for paged static front-page is wrong": "patches/42835.bezirksblaetter.patch"
}
}
......
This diff is collapsed.
......@@ -8,7 +8,6 @@ define('SCRIPT_DEBUG', true);
define('WP_DEBUG_DISPLAY', true);
define('WP_POST_REVISIONS', false);
define('DISALLOW_FILE_MODS', false);
define('WP_HTTP_BLOCK_EXTERNAL', false);
define('WP_DISABLE_FATAL_ERROR_HANDLER', true);
define('DISABLED_PLUGINS', [
'nginx-cache/nginx-cache.php',
......
......@@ -8,7 +8,6 @@ define('SCRIPT_DEBUG', false);
define('WP_DEBUG_DISPLAY', false);
define('WP_POST_REVISIONS', 10);
define('DISALLOW_FILE_MODS', true);
define('WP_HTTP_BLOCK_EXTERNAL', !(defined('WP_CLI') && WP_CLI));
define('WP_DISABLE_FATAL_ERROR_HANDLER', false);
define('DISABLED_PLUGINS', []);
define('STATIFY_IGNORE_REMOTE_ADDRESSES', explode(',', env('STATIFY_IGNORE_REMOTE_ADDRESSES')));
......
Index: src/wp-includes/ms-functions.php
===================================================================
--- src/wp-includes/ms-functions.php (revision 44770)
--- src/wp-includes/ms-functions.php (revision 47544)
+++ src/wp-includes/ms-functions.php (working copy)
@@ -913,7 +913,7 @@
@@ -946,7 +946,7 @@
$activate_url = esc_url( $activate_url );
$admin_email = get_site_option( 'admin_email' );
if ( $admin_email == '' ) {
if ( '' == $admin_email ) {
- $admin_email = '[email protected]' . $_SERVER['SERVER_NAME'];
+ $admin_email = '[email protected]' . wp_parse_url( network_home_url(), PHP_URL_HOST );
}
$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
@@ -1036,7 +1036,7 @@
@@ -1071,7 +1071,7 @@
// Send email with activation link.
$admin_email = get_site_option( 'admin_email' );
if ( $admin_email == '' ) {
if ( '' == $admin_email ) {
- $admin_email = '[email protected]' . $_SERVER['SERVER_NAME'];
+ $admin_email = '[email protected]' . wp_parse_url( network_home_url(), PHP_URL_HOST );
}
$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
@@ -1586,7 +1586,7 @@
@@ -1635,7 +1635,7 @@
$admin_email = get_site_option( 'admin_email' );
if ( $admin_email == '' ) {
if ( '' == $admin_email ) {
- $admin_email = '[email protected]' . $_SERVER['SERVER_NAME'];
+ $admin_email = '[email protected]' . wp_parse_url( network_home_url(), PHP_URL_HOST );
}
$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
@@ -1677,7 +1677,7 @@
@@ -1727,7 +1727,7 @@
$admin_email = get_site_option( 'admin_email' );
if ( $admin_email == '' ) {
if ( '' == $admin_email ) {
- $admin_email = '[email protected]' . $_SERVER['SERVER_NAME'];
+ $admin_email = '[email protected]' . wp_parse_url( network_home_url(), PHP_URL_HOST );
}
$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
Index: src/wp-includes/pluggable.php
===================================================================
--- src/wp-includes/pluggable.php (revision 44770)
--- src/wp-includes/pluggable.php (revision 47544)
+++ src/wp-includes/pluggable.php (working copy)
@@ -330,7 +330,7 @@
@@ -328,7 +328,7 @@
*/
if ( ! isset( $from_email ) ) {
// Get the site domain and get rid of www.
- $sitename = strtolower( $_SERVER['SERVER_NAME'] );
......@@ -51,17 +51,12 @@ Index: src/wp-includes/pluggable.php
if ( substr( $sitename, 0, 4 ) == 'www.' ) {
$sitename = substr( $sitename, 4 );
}
@@ -1582,7 +1582,7 @@
@@ -1640,7 +1640,7 @@
$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
}
- $wp_email = '[email protected]' . preg_replace( '#^www\.#', '', strtolower( $_SERVER['SERVER_NAME'] ) );
+ $wp_email = '[email protected]' . preg_replace( '#^www\.#', '', wp_parse_url( network_home_url(), PHP_URL_HOST ) );
if ( '' == $comment->comment_author ) {
$from = "From: \"$blogname\" <$wp_email>";
@@ -2742,4 +2742,3 @@
return $r;
}
endif;
-
Index: src/wp-includes/update.php
===================================================================
--- src/wp-includes/update.php (revision 44770)
+++ src/wp-includes/update.php (working copy)
@@ -26,6 +26,10 @@
return;
}
+ if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) {
+ return;
+ }
+
global $wpdb, $wp_local_package;
// include an unmodified $wp_version
include( ABSPATH . WPINC . '/version.php' );
@@ -258,6 +262,10 @@
return;
}
+ if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) {
+ return;
+ }
+
// include an unmodified $wp_version
include( ABSPATH . WPINC . '/version.php' );
@@ -436,6 +444,10 @@
return;
}
+ if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) {
+ return;
+ }
+
// include an unmodified $wp_version
include( ABSPATH . WPINC . '/version.php' );
......@@ -2,11 +2,12 @@
Theme Name: Bezirksblätter
Theme URI: https://gitlab.com/chesio/bezirksblaetter/
Description: Custom theme for <a href="https://www.bezirksblaetter.cz">Bezirksblätter.cz</a> based on <a href="https://github.com/roots/sage">Sage starter theme</a>.
Version: 20190202
Version: 20200401
Author: Česlav Przywara <[email protected]>
Author URI: https://www.chesio.com
Author URI: https://www.chesio.com/
Text Domain: bezirksblaetter
License: MIT License
License URI: http://opensource.org/licenses/MIT
Requires: PHP 7.1 or newer and WordPress 4.9 or newer
Requires PHP: 7.3
Requires at least: 5.4
*/