Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

4.1 Docs Audit: Improve inline documentation for the new WP_Query::setup_postdata() method.

Browse Source 
See #30469.

Built from https://develop.svn.wordpress.org/trunk@30620


git-svn-id: http://core.svn.wordpress.org/trunk@30610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2014-11-28 12:18:22 +00:00
parent 4fd64b94d7
commit fdb0b54389
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/query.php
View File

@ -4558,8 +4558,10 @@ class WP_Query {
if ( ! $page )
$page = 1;
// Force full post content when viewing the permalink for the $post, or
// when on an RSS feed. Otherwise respect the 'more' tag.
/*
* Force full post content when viewing the permalink for the $post,
* or when on an RSS feed. Otherwise respect the 'more' tag.
*/
if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) {
$more = 1;
} else if ( $this->is_feed() ) {
@ -4575,9 +4577,11 @@ class WP_Query {
$content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
$content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
// Ignore nextpage at the beginning of the content.
if ( 0 === strpos( $content, '<!--nextpage-->' ) )
$content = substr( $content, 15 );
$pages = explode('<!--nextpage-->', $content);
$numpages = count($pages);
if ( $numpages > 1 )
@ -4590,7 +4594,7 @@ class WP_Query {
* Fires once the post data has been setup.
*
* @since 2.8.0
* @since 4.1.0 Introduced $this parameter.
* @since 4.1.0 Introduced `$this` parameter.
*
* @param WP_Post &$post The Post object (passed by reference).
* @param WP_Query &$this The current Query object (passed by reference).

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-beta2-30619';
$wp_version = '4.1-beta2-30620';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.