WordPress.org

Make WordPress Core

Changeset 15227


Ignore:
Timestamp:
06/11/10 17:04:06 (4 years ago)
Author:
nacin
Message:

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

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/schema.php

    r15202 r15227  
    315315    'embed_size_w' => '', 
    316316    'embed_size_h' => 600, 
     317 
     318    // 3.0 
     319    'page_for_posts' => 0, 
     320    'page_on_front' => 0, 
    317321    ); 
    318322 
  • trunk/wp-admin/options-reading.php

    r15132 r15227  
    3939<input name="show_on_front" type="hidden" value="posts" /> 
    4040<table class="form-table"> 
    41 <?php else : ?> 
     41<?php else : 
     42    if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) ) 
     43        update_option( 'show_on_front', 'posts' ); 
     44?> 
    4245<table class="form-table"> 
    4346<tr valign="top"> 
     
    5558    </p> 
    5659<ul> 
    57     <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> 
    58     <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> 
     60    <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> 
     61    <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> 
    5962</ul> 
    6063<?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?> 
  • trunk/wp-includes/formatting.php

    r14996 r15227  
    24032403        case 'comment_max_links': 
    24042404        case 'page_on_front': 
     2405        case 'page_for_posts': 
    24052406        case 'rss_excerpt_length': 
    24062407        case 'default_category': 
  • trunk/wp-includes/general-template.php

    r15224 r15227  
    586586    if ( is_single() || ( is_home() && !is_front_page() ) || ( is_page() && !is_front_page() ) ) { 
    587587        $post = $wp_query->get_queried_object(); 
    588         $title = apply_filters( 'single_post_title', empty( $post->post_title ) ? '' : $post->post_title ); 
     588        $title = apply_filters( 'single_post_title', $post->post_title ); 
    589589    } 
    590590 
Note: See TracChangeset for help on using the changeset viewer.