WordPress 3.5.1

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

diff --git a/wp-admin/options.php b/wp-admin/options.php
index 8eb283a84bfa673ff511b5276bc292c021418f0c..92ae917bf7d4760c7945fba2a4d892136f6d2775 100644 (file)
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -61,14 +61,16 @@ if ( is_multisite() && !is_super_admin() && 'update' != $action )
 $whitelist_options = array(
        'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
        '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', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
-       'privacy' => array( 'blog_public' ),
-       'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
-       'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format', 'enable_app', 'enable_xmlrpc' ),
-       'options' => array( '' ) );
+       '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' )
+);
+$whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
-$uploads_options = array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path');
+
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+       $whitelist_options['reading'][] = 'blog_charset';
 
 if ( !is_multisite() ) {
        if ( !defined( 'WP_SITEURL' ) )
@@ -83,16 +85,19 @@ if ( !is_multisite() ) {
        $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
        $whitelist_options['writing'][] = 'ping_sites';
 
-       $whitelist_options['media'] = array_merge($whitelist_options['media'], $uploads_options);
+       $whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
+
+       // If upload_url_path and upload_path are both default values, they're locked.
+       if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
+               $whitelist_options['media'][] = 'upload_path';
+               $whitelist_options['media'][] = 'upload_url_path';
+       }
 } else {
        $whitelist_options['general'][] = 'new_admin_email';
        $whitelist_options['general'][] = 'WPLANG';
-       $whitelist_options['general'][] = 'language';
 
        if ( apply_filters( 'enable_post_by_email_configuration', true ) )
                $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
-
-       $whitelist_options[ 'misc' ] = array();
 }
 
 $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
@@ -139,19 +144,20 @@ if ( 'update' == $action ) {
                        if ( $unregistered )
                                _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
 
-                       $option = trim($option);
+                       $option = trim( $option );
                        $value = null;
-                       if ( isset($_POST[$option]) )
-                               $value = $_POST[$option];
-                       if ( !is_array($value) )
-                               $value = trim($value);
-                       $value = stripslashes_deep($value);
-                       update_option($option, $value);
+                       if ( isset( $_POST[ $option ] ) ) {
+                               $value = $_POST[ $option ];
+                               if ( ! is_array( $value ) )
+                                       $value = trim( $value );
+                               $value = stripslashes_deep( $value );
+                       }
+                       update_option( $option, $value );
                }
        }
 
        /**
-        *  Handle settings errors and return to options page
+        * Handle settings errors and return to options page
         */
        // If no settings errors were registered add a general 'updated' message.
        if ( !count( get_settings_errors() ) )
@@ -221,7 +227,5 @@ endforeach;
   </form>
 </div>
 
-
 <?php
 include('./admin-footer.php');
-?>