Index: wp-admin/admin.php =================================================================== --- wp-admin/admin.php (revision 18494) +++ wp-admin/admin.php (working copy) @@ -108,6 +108,9 @@ if ( current_user_can( 'manage_options' ) ) @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) ); +if ( function_exists( '_admin_init' ) ) + call_user_func( '_admin_init' ); + do_action('admin_init'); if ( isset($plugin_page) ) { Index: wp-admin/options-media.php =================================================================== --- wp-admin/options-media.php (revision 18494) +++ wp-admin/options-media.php (working copy) @@ -6,136 +6,167 @@ * @subpackage Administration */ -/** WordPress Administration Bootstrap */ -require_once('./admin.php'); - -if ( ! current_user_can( 'manage_options' ) ) - wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) ); - -$title = __('Media Settings'); -$parent_file = 'options-general.php'; - -add_contextual_help($current_screen, - '

' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '

' . - '

' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.') . '

' . - ( is_multisite() ? '' : '

' . __('Uploading Options gives you folder and path choices for storing your files in your installation’s directory.') . '

' ) . - '

' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

' . - '

' . __('For more information:') . '

' . - '

' . __('Documentation on Media Settings') . '

' . - '

' . __('Support Forums') . '

' -); - -include('./admin-header.php'); - -?> - -
- -

- -
- - -

-

- - - - - - + - - - + + - - - + + -
+function setting_thumbnail_size() { ?>
/> -
+function setting_medium_size() { ?> +
-
+function setting_large_size() { ?> +
-
- -

- - - - - - - + + - - - + -
+function setting_auto_embed() { ?> +
-
+function setting_max_embed_size() { ?> ' . __("If the width value is left blank, embeds will default to the max width of your theme."); ?> -
- - -

- - - - - + - - - + - - + -
+function setting_upload_path() { ?> + wp-content/uploads'); ?> -
+function setting_upload_url_patch() { ?> + -
+function setting_upload_use_year_month() { ?> -
- +function section_default() { + echo '

' . __('The sizes listed below determine the maximum dimensions in pixels to use when inserting an image into the body of a post.') . '

'; +} - +function section_embeds() {} - +function section_uploads() {} +function _admin_init() { + $settings = 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' ); + if ( ! is_multisite() ) + $settings = array_merge( $settings, array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path') ); + + foreach ( $settings as $setting ) { + register_setting( 'media', $setting ); + } + + add_settings_section( 'default', __('Image sizes'), 'section_default', 'media' ); + + add_settings_field( 'thumbnail-size', __('Thumbnail size'), 'setting_thumbnail_size', 'media', 'default' ); + add_settings_field( 'medium-size', __('Medium size'), 'setting_medium_size', 'media', 'default' ); + add_settings_field( 'large-size', __('Large size'), 'setting_large_size', 'media', 'default' ); + + add_settings_section( 'embeds', __('Embeds'), 'section_embeds', 'media' ); + + add_settings_field( 'embed_autourls', __('Auto-embeds'), 'setting_auto_embed', 'media', 'embeds' ); + add_settings_field( 'max-embed-size', __('Maximum embed size'), 'setting_max_embed_size', 'media', 'embeds' ); + + if ( ! is_multisite() ) { + add_settings_section( 'uploads', __('Uploading Files'), 'section_uploads', 'media' ); + + add_settings_field( 'upload_path', __('Store uploads in this folder'), 'setting_upload_path', 'media', 'uploads' ); + add_settings_field( 'upload_url_path', __('Full URL path to files'), 'setting_upload_url_path', 'media', 'uploads' ); + add_settings_field( 'uploads_use_yearmonth_folders', '', 'setting_upload_use_year_month', 'media', 'uploads' ); + } +} + +/** WordPress Administration Bootstrap */ +require_once('./admin.php'); + +if ( ! current_user_can( 'manage_options' ) ) + wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) ); + +wp_reset_vars( array( 'action' ) ); + +$title = __('Media Settings'); +$parent_file = 'options-general.php'; + +add_contextual_help($current_screen, + '

' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '

' . + '

' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.') . '

' . + ( is_multisite() ? '' : '

' . __('Uploading Options gives you folder and path choices for storing your files in your installation’s directory.') . '

' ) . + '

' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '

' . + '

' . __('For more information:') . '

' . + '

' . __('Documentation on Media Settings') . '

' . + '

' . __('Support Forums') . '

' +); + +if ( 'update' == $action ) { + check_admin_referer( 'media-options' ); + + $options = $new_whitelist_options['media']; // Lame + + foreach ( (array) $options as $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 ( !count( get_settings_errors() ) ) + add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated'); +} + +$no_options_header = true; // Lame + +include('./admin-header.php'); +?> + +
+ +

+ + + -
- + 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( '' ) ); $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass'); -$uploads_options = array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path'); if ( !is_multisite() ) { if ( !defined( 'WP_SITEURL' ) ) @@ -82,8 +80,6 @@ $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); } else { $whitelist_options['general'][] = 'new_admin_email'; $whitelist_options['general'][] = 'WPLANG';