WordPress 4.6.3

[autoinstalls/wordpress.git] / wp-admin / options.php

diff --git a/wp-admin/options.php b/wp-admin/options.php
index 752d7b46ffe21a8003271b4eda405746646ceca6..f319d5208e79b185dd2657999ec4cb30ff7da0bb 100644 (file)
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -32,7 +32,7 @@ if ( empty($option_page) ) {
 } else {
 
        /**
-        * Filter the capability required when using the Settings API.
+        * Filters the capability required when using the Settings API.
         *
         * By default, the options groups for all registered settings require the manage_options capability.
         * This filter is required to change the capability required for a certain options page.
@@ -44,15 +44,20 @@ if ( empty($option_page) ) {
        $capability = apply_filters( "option_page_capability_{$option_page}", $capability );
 }
 
-if ( !current_user_can( $capability ) )
-       wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can( $capability ) ) {
+       wp_die(
+               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+               '<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
+               403
+       );
+}
 
 // Handle admin email change requests
 if ( is_multisite() ) {
        if ( ! empty($_GET[ 'adminhash' ] ) ) {
                $new_admin_details = get_option( 'adminhash' );
                $redirect = 'options-general.php?updated=false';
-               if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && !empty($new_admin_details[ 'newemail' ]) ) {
+               if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'adminhash' ] ) && !empty($new_admin_details[ 'newemail' ]) ) {
                        update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
                        delete_option( 'adminhash' );
                        delete_option( 'new_admin_email' );
@@ -61,6 +66,7 @@ if ( is_multisite() ) {
                wp_redirect( admin_url( $redirect ) );
                exit;
        } elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
+               check_admin_referer( 'dismiss-' . get_current_blog_id() . '-new_admin_email' );
                delete_option( 'adminhash' );
                delete_option( 'new_admin_email' );
                wp_redirect( admin_url( 'options-general.php?updated=true' ) );
@@ -68,8 +74,13 @@ if ( is_multisite() ) {
        }
 }
 
-if ( is_multisite() && !is_super_admin() && 'update' != $action )
-       wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+if ( is_multisite() && ! is_super_admin() && 'update' != $action ) {
+       wp_die(
+               '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+               '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+               403
+       );
+}
 
 $whitelist_options = array(
        'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
@@ -114,7 +125,7 @@ if ( !is_multisite() ) {
        $whitelist_options['general'][] = 'new_admin_email';
 
        /**
-        * Filter whether the post-by-email functionality is enabled.
+        * Filters whether the post-by-email functionality is enabled.
         *
         * @since 3.0.0
         *
@@ -125,7 +136,7 @@ if ( !is_multisite() ) {
 }
 
 /**
- * Filter the options white list.
+ * Filters the options white list.
  *
  * @since 2.7.0
  *
@@ -150,7 +161,7 @@ if ( 'update' == $action ) {
 
        if ( 'options' == $option_page ) {
                if ( is_multisite() && ! is_super_admin() )
-                       wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
+                       wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
                $options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
        } else {
                $options = $whitelist_options[ $option_page ];
@@ -184,8 +195,15 @@ if ( 'update' == $action ) {
 
        if ( $options ) {
                foreach ( $options as $option ) {
-                       if ( $unregistered )
-                               _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
+                       if ( $unregistered ) {
+                               _deprecated_argument( 'options.php', '2.7.0',
+                                       sprintf(
+                                               /* translators: %s: the option/setting */
+                                               __( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ),
+                                               '<code>' . $option . '</code>'
+                                       )
+                               );
+                       }
 
                        $option = trim( $option );
                        $value = null;