From 0eb4f6ccfc6ea8fa7972d897ca858ad368a21f4d Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Sun, 7 Feb 2016 13:26:27 +0000 Subject: [PATCH] Users: Use `self_admin_url()` for the email change confirmation link. Prevents sending users to wp-admin/profile.php if they only have access to wp-admin/user/profile.php. Fixes #35766. Built from https://develop.svn.wordpress.org/trunk@36503 git-svn-id: http://core.svn.wordpress.org/trunk@36470 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ms.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 02461f2d4a..4eef206ee8 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -309,7 +309,7 @@ All at ###SITENAME### $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( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash='.$hash ) ), $content ); $content = str_replace( '###EMAIL###', $value, $content ); $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); $content = str_replace( '###SITEURL###', network_home_url(), $content ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 57b9e1b8ed..d4e3009d4d 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-36502'; +$wp_version = '4.5-alpha-36503'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.