From 198cdb1ddeedf731b653e0d2c1dae9065e8c941b Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Tue, 4 Aug 2015 11:39:25 +0000 Subject: [PATCH] Multisite mails: Initialize `$current_user` before accessing `$current_user->user_login`. props Toro_Unit. see #31217. fixes #33254. Built from https://develop.svn.wordpress.org/trunk@33569 git-svn-id: http://core.svn.wordpress.org/trunk@33536 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ms.php | 1 + wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 8c6aa48bba..ffed184b21 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -298,6 +298,7 @@ All at ###SITENAME### */ $content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email ); + $current_user = wp_get_current_user(); $content = str_replace( '###USERNAME###', $current_user->user_login, $content ); $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content ); $content = str_replace( '###EMAIL###', $value, $content ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 77b9e6efe5..fe950ae5e4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-RC1-33563'; +$wp_version = '4.3-RC1-33569'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.