From 614fb6c3a1678405b87ab4f73b2ae40016cb3250 Mon Sep 17 00:00:00 2001
From: saxmatt <saxmatt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 22 Apr 2004 15:20:03 +0000
Subject: [PATCH] Wrong time in time format examples and posts_per_rss not
 updating.

git-svn-id: http://svn.automattic.com/wordpress/trunk@1124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php | 4 ++--
 wp-admin/options-reading.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 94f99f6a83..dd388e0f6a 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -98,12 +98,12 @@ include('options-head.php');
       <tr>
       	<th scope="row"><?php _e('Default date format:') ?></th>
       	<td><input name="date_format" type="text" id="date_format" size="30" value="<?php echo get_settings('date_format'); ?>" /><br />
-Output: <strong><?php echo date(get_settings('date_format'), current_time('timestamp')); ?></strong></td>
+Output: <strong><?php echo date(get_settings('date_format'), current_time('timestamp', true)); ?></strong></td>
       	</tr>
       <tr>
         <th scope="row"><?php _e('Default time format:') ?></th>
       	<td><input name="time_format" type="text" id="time_format" size="30" value="<?php echo get_settings('time_format'); ?>" /><br />
-Output: <strong><?php echo date(get_settings('time_format'), current_time('timestamp')); ?></strong></td>
+Output: <strong><?php echo date(get_settings('time_format'), current_time('timestamp', true)); ?></strong></td>
       	</tr> 
 </table>
     </fieldset> 
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 2cbda047ce..de63bdf9e6 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -46,7 +46,7 @@ include('options-head.php');
 	<h2><?php _e('Reading Options') ?></h2> 
 	<form name="form1" method="post" action="options.php"> 
 		<input type="hidden" name="action" value="update" /> 
-		<input type="hidden" name="page_options" value="'posts_per_page','what_to_show','rss_use_excerpt','blog_charset','gzipcompression' " /> 
+		<input type="hidden" name="page_options" value="'posts_per_page','what_to_show','posts_per_rss','rss_use_excerpt','blog_charset','gzipcompression' " /> 
 		<fieldset class="options"> 
         <legend><?php _e('Front Page') ?></legend> 
 		<table width="100%" cellspacing="2" cellpadding="5" class="editform">