--- a/wp/wp-admin/options.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/options.php Mon Oct 14 17:39:30 2019 +0200
@@ -32,7 +32,7 @@
} 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,39 +44,107 @@
$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>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+ '<p>' . __( 'Sorry, you are not allowed to manage these options.' ) . '</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' ]) ) {
- update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
- delete_option( 'adminhash' );
- delete_option( 'new_admin_email' );
- $redirect = 'options-general.php?updated=true';
- }
- wp_redirect( admin_url( $redirect ) );
- exit;
- } elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
+if ( ! empty( $_GET[ 'adminhash' ] ) ) {
+ $new_admin_details = get_option( 'adminhash' );
+ $redirect = 'options-general.php?updated=false';
+ 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' );
- wp_redirect( admin_url( 'options-general.php?updated=true' ) );
- exit;
+ $redirect = 'options-general.php?updated=true';
}
+ 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' ) );
+ exit;
+}
+
+if ( is_multisite() && ! current_user_can( 'manage_network_options' ) && 'update' != $action ) {
+ wp_die(
+ '<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+ '<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+ 403
+ );
}
-if ( is_multisite() && !is_super_admin() && 'update' != $action )
- wp_die( __( 'Cheatin’ uh?' ), 403 );
-
$whitelist_options = array(
- 'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
- 'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
- 'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
- 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
- 'writing' => array( 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' )
+ 'general' => array(
+ 'blogname',
+ 'blogdescription',
+ 'gmt_offset',
+ 'date_format',
+ 'time_format',
+ 'start_of_week',
+ 'timezone_string',
+ 'WPLANG',
+ 'new_admin_email',
+ ),
+ 'discussion' => array(
+ 'default_pingback_flag',
+ 'default_ping_status',
+ 'default_comment_status',
+ 'comments_notify',
+ 'moderation_notify',
+ 'comment_moderation',
+ 'require_name_email',
+ 'comment_whitelist',
+ 'comment_max_links',
+ 'moderation_keys',
+ 'blacklist_keys',
+ 'show_avatars',
+ 'avatar_rating',
+ 'avatar_default',
+ 'close_comments_for_old_posts',
+ 'close_comments_days_old',
+ 'thread_comments',
+ 'thread_comments_depth',
+ 'page_comments',
+ 'comments_per_page',
+ 'default_comments_page',
+ 'comment_order',
+ 'comment_registration',
+ 'show_comments_cookies_opt_in',
+ ),
+ 'media' => array(
+ 'thumbnail_size_w',
+ 'thumbnail_size_h',
+ 'thumbnail_crop',
+ 'medium_size_w',
+ 'medium_size_h',
+ 'large_size_w',
+ 'large_size_h',
+ 'image_default_size',
+ 'image_default_align',
+ 'image_default_link_type',
+ ),
+ 'reading' => array(
+ 'posts_per_page',
+ 'posts_per_rss',
+ 'rss_use_excerpt',
+ 'show_on_front',
+ 'page_on_front',
+ 'page_for_posts',
+ 'blog_public',
+ ),
+ 'writing' => array(
+ 'default_category',
+ 'default_email_category',
+ 'default_link_category',
+ 'default_post_format',
+ ),
);
$whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
@@ -85,13 +153,17 @@
if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
$whitelist_options['reading'][] = 'blog_charset';
+if ( get_site_option( 'initial_db_version' ) < 32453 ) {
+ $whitelist_options['writing'][] = 'use_smilies';
+ $whitelist_options['writing'][] = 'use_balanceTags';
+}
+
if ( !is_multisite() ) {
if ( !defined( 'WP_SITEURL' ) )
$whitelist_options['general'][] = 'siteurl';
if ( !defined( 'WP_HOME' ) )
$whitelist_options['general'][] = 'home';
- $whitelist_options['general'][] = 'admin_email';
$whitelist_options['general'][] = 'users_can_register';
$whitelist_options['general'][] = 'default_role';
@@ -106,10 +178,8 @@
$whitelist_options['media'][] = 'upload_url_path';
}
} else {
- $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
*
@@ -120,11 +190,11 @@
}
/**
- * Filter the options white list.
+ * Filters the options white list.
*
* @since 2.7.0
*
- * @param array White list options.
+ * @param array $whitelist_options White list options.
*/
$whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
@@ -144,8 +214,9 @@
wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
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.' ) );
+ if ( is_multisite() && ! current_user_can( 'manage_network_options' ) ) {
+ 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 ];
@@ -164,8 +235,8 @@
$_POST['timezone_string'] = '';
}
- // Handle translation install.
- if ( ! empty( $_POST['WPLANG'] ) && ( ! is_multisite() || is_super_admin() ) ) { // @todo: Skip if already installed
+ // Handle translation installation.
+ if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
if ( wp_can_install_language_pack() ) {
@@ -178,27 +249,40 @@
}
if ( $options ) {
+ $user_language_old = get_user_locale();
+
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;
if ( isset( $_POST[ $option ] ) ) {
$value = $_POST[ $option ];
- if ( ! is_array( $value ) )
+ if ( ! is_array( $value ) ) {
$value = trim( $value );
+ }
$value = wp_unslash( $value );
}
update_option( $option, $value );
}
- // Switch translation in case WPLANG was changed.
- $language = get_option( 'WPLANG' );
- if ( $language ) {
- load_default_textdomain( $language );
- } else {
- unload_textdomain( 'default' );
+ /*
+ * Switch translation in case WPLANG was changed.
+ * The global $locale is used in get_locale() which is
+ * used as a fallback in get_user_locale().
+ */
+ unset( $GLOBALS['locale'] );
+ $user_language_new = get_user_locale();
+ if ( $user_language_old !== $user_language_new ) {
+ load_default_textdomain( $user_language_new );
}
}
@@ -221,7 +305,7 @@
include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
<div class="wrap">
- <h2><?php esc_html_e('All Settings'); ?></h2>
+ <h1><?php esc_html_e( 'All Settings' ); ?></h1>
<form name="form" action="options.php" method="post" id="all-options">
<?php wp_nonce_field('options-options') ?>
<input type="hidden" name="action" value="update" />