Changeset 3581

Timestamp:

03/01/2006 07:08:04 AM (20 years ago)

Author:

ryan

Message:

What's up front? #2515

Location:

trunk

Files:

• wp-admin/options-reading.php (modified) (2 diffs)
• wp-admin/upgrade-functions.php (modified) (1 diff)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-includes/classes.php (modified) (3 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/options-reading.php

@@ -10 +10 @@
 <div class="wrap"> 
 <h2><?php _e('Reading Options') ?></h2> 
-<form name="form1" method="post" action="options.php"> 
+<form name="form1" method="post" action="options.php">
+
+<?php if ( get_pages() ): ?>
+<fieldset class="options"> 
+<legend><?php _e('Front Page') ?></legend> 
+<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+<tr valign="top"> 
+<th width="33%" scope="row"></th> 
+<td>
+<p>
+    <label>
+        <input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> /> 
+        <?php _e('Show the latest posts on the front page'); ?>
+    </label>
+</p>
+<p>
+    <label>
+        <input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> /> 
+        <?php printf(__('Show another <a href="%s">page</a> on the front page (Select below)'), 'edit-pages.php'); ?>
+    </label>
+</p>
+<p>
+    <?php printf(__('Show this page on the front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&selected=" . get_option('page_on_front'))); ?><br />
+    <?php printf(__('Show the latest posts on this page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&selected=" . get_option('page_for_posts'))); ?>
+</p>
+</td> 
+</tr> 
+</table> 
+</fieldset>
+<?php endif; ?>
+
 <fieldset class="options"> 
 <legend><?php _e('Blog Pages') ?></legend> 
@@ -56 +86 @@
 <p class="submit">
 <input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,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,show_on_front,page_on_front,page_for_posts" /> 
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
 </p> 

trunk/wp-admin/upgrade-functions.php

@@ -35 +35 @@
         upgrade_160();
 
-    if ( $wp_current_db_version < 3570 )
+    if ( $wp_current_db_version < 3582 )
         upgrade_210();
 

trunk/wp-admin/upgrade-schema.php

@@ -243 +243 @@
     add_option('blog_public', 1);
     add_option('default_link_category', 2);
+    add_option('show_on_front', 'posts');
 
     // Delete unused options

trunk/wp-includes/classes.php

@@ -294 +294 @@
         }
 
+        if ( $this->is_home && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+            $this->is_page = true;
+            $this->is_home = false;
+            $q['page_id'] = get_option('page_on_front');
+        }
+
         if (isset($q['page'])) {
             $q['page'] = trim($q['page'], '/');
@@ -364 +370 @@
             else
                 $reqpage = 0;
-            $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
-            $page_paths = '/' . trim($q['pagename'], '/');
-            $q['pagename'] = sanitize_title(basename($page_paths));
-            $q['name'] = $q['pagename'];
-
-            $where .= " AND (ID = '$reqpage')";
+
+            if  ( ('page' == get_option('show_on_front') ) && ( $reqpage == get_option('page_for_posts') ) ) {
+                $this->is_page = false;
+                $this->is_home = true;
+            } else {
+                $q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
+                $page_paths = '/' . trim($q['pagename'], '/');
+                $q['pagename'] = sanitize_title(basename($page_paths));
+                $q['name'] = $q['pagename'];
+                $where .= " AND (ID = '$reqpage')";
+            }
         } elseif ('' != $q['attachment']) {
             $q['attachment'] = str_replace('%2F', '/', urlencode(urldecode($q['attachment'])));
@@ -398 +409 @@
         if (($q['page_id'] != '') && (intval($q['page_id']) != 0)) {
             $q['page_id'] = intval($q['page_id']);
-            $q['p'] = $q['page_id'];
-            $where = ' AND ID = '.$q['page_id'];
+            if  ( ('page' == get_option('show_on_front') ) && ( $q['page_id'] == get_option('page_for_posts') ) ) {
+                $this->is_page = false;
+                $this->is_home = true;
+            } else {
+                $q['p'] = $q['page_id'];
+                $where = ' AND ID = '.$q['page_id'];
+            }
         }
 

trunk/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.1-alpha1';
-$wp_db_version = 3570;
+$wp_db_version = 3582;
 
 ?>