- |
-
- |
-
-
+
|
Index: wp-admin/options.php
===================================================================
--- wp-admin/options.php (revision 22645)
+++ wp-admin/options.php (working copy)
@@ -62,7 +62,7 @@
'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' ),
- 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'blog_public' ),
+ '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();
Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php (revision 22645)
+++ wp-includes/formatting.php (working copy)
@@ -2786,11 +2786,6 @@
$value = absint( $value );
break;
- case 'show_on_front' :
- if ( ! $value )
- $value = 'posts';
- break;
-
case 'posts_per_page':
case 'posts_per_rss':
$value = (int) $value;
Index: wp-includes/script-loader.php
===================================================================
--- wp-includes/script-loader.php (revision 22645)
+++ wp-includes/script-loader.php (working copy)
@@ -357,14 +357,10 @@
$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
- $scripts->add( 'sample-permalink', "/wp-admin/js/sample-permalink$suffix.js", array(), false, 1 );
- did_action( 'init' ) && $scripts->localize( 'sample-permalink', 'samplePermalinkL10n', array(
+ $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), false, 1 );
+ did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
'ok' => __('OK'),
'cancel' => __('Cancel'),
- ) );
-
- $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'sample-permalink' ), false, 1 );
- did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
'publishOn' => __('Publish on:'),
'publishOnFuture' => __('Schedule for:'),
'publishOnPast' => __('Published on:'),
|