From d682c0b03d2508570d86bb339b2a9bbb996b0980 Mon Sep 17 00:00:00 2001 From: nacin Date: Sun, 24 Oct 2010 19:20:52 +0000 Subject: [PATCH] Disable static page dropdowns when 'latest posts' is selected on Settings > Reading. props koopersmith, fixes #15205. git-svn-id: http://svn.automattic.com/wordpress/trunk@15946 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/options-general.php | 4 ++-- wp-admin/options-reading.php | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index e9f851c6eb..61019f0e48 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -21,7 +21,7 @@ $timezone_format = _x('Y-m-d G:i:s', 'timezone date format'); * Display JavaScript on the page. * * @package WordPress - * @subpackage General_Settings_Panel + * @subpackage General_Settings_Screen */ function add_js() { ?> @@ -56,7 +56,7 @@ function add_js() { ' . __('The fields on this screen determine some of the basics of your site setup.') . '

' . diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index aeb01d1233..3b036ba1f5 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -15,6 +15,32 @@ if ( ! current_user_can( 'manage_options' ) ) $title = __( 'Reading Settings' ); $parent_file = 'options-general.php'; +/** + * Display JavaScript on the page. + * + * @package WordPress + * @subpackage Reading_Settings_Screen + */ +function add_js() { +?> + +' . __('This screen contains the settings that affect the display of your content.') . '

' . '

' . sprintf(__('You can choose what’s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two Pages. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page') . '

' .