Changeset 15227

Timestamp:

06/11/2010 05:04:06 PM (12 years ago)

Author:

nacin

Message:

Fix warnings related to static pages. props zeo for initial patch. fixes #13830.

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/options-reading.php (modified) (2 diffs)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)

trunk/wp-admin/includes/schema.php

@@ -315 +315 @@
     'embed_size_w' => '',
     'embed_size_h' => 600,
+
+    // 3.0
+    'page_for_posts' => 0,
+    'page_on_front' => 0,
     );
 

trunk/wp-admin/options-reading.php

@@ -39 +39 @@
 <input name="show_on_front" type="hidden" value="posts" />
 <table class="form-table">
-<?php else : ?>
+<?php else :
+    if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
+        update_option( 'show_on_front', 'posts' );
+?>
 <table class="form-table">
 <tr valign="top">
@@ -55 +58 @@
     </p>
 <ul>
-    <li><label for="page_on_front"><?php printf( __( 'Front page: %s' ), wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'selected' => get_option( 'page_on_front' ) ) ) ); ?></label></li>
-    <li><label for="page_for_posts"><?php printf( __( 'Posts page: %s' ), wp_dropdown_pages( array( 'name' => 'page_for_posts', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'selected' => get_option( 'page_for_posts' ) ) ) ); ?></label></li>
+    <li><label for="page_on_front"><?php printf( __( 'Front page: %s' ), wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_on_front' ) ) ) ); ?></label></li>
+    <li><label for="page_for_posts"><?php printf( __( 'Posts page: %s' ), wp_dropdown_pages( array( 'name' => 'page_for_posts', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_for_posts' ) ) ) ); ?></label></li>
 </ul>
 <?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>

trunk/wp-includes/formatting.php

@@ -2403 +2403 @@
         case 'comment_max_links':
         case 'page_on_front':
+        case 'page_for_posts':
         case 'rss_excerpt_length':
         case 'default_category':

trunk/wp-includes/general-template.php

@@ -586 +586 @@
     if ( is_single() || ( is_home() && !is_front_page() ) || ( is_page() && !is_front_page() ) ) {
         $post = $wp_query->get_queried_object();
-        $title = apply_filters( 'single_post_title', empty( $post->post_title ) ? '' : $post->post_title );
+        $title = apply_filters( 'single_post_title', $post->post_title );
     }