WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Twenty Fourteen: change hardcoded pagination base to use the WordPress Rewrite object's `pagination_base` value instead. Document global variable usage properly. 

Props SergeyBiryukov, fixes #28405.
Built from https://develop.svn.wordpress.org/trunk@28645


git-svn-id: http://core.svn.wordpress.org/trunk@28463 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Lance Willett 2014-05-31 18:51:19 +00:00
parent ee9d9133ac
commit c2f0505bcf
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-content/themes/twentyfourteen/inc/template-tags.php
View File

@ -12,10 +12,15 @@ if ( ! function_exists( 'twentyfourteen_paging_nav' ) ) :
* Display navigation to next/previous set of posts when applicable. * Display navigation to next/previous set of posts when applicable.
* *
* @since Twenty Fourteen 1.0 * @since Twenty Fourteen 1.0
*
* @global WP_Query $wp_query WordPress Query object.
* @global WP_Rewrite $wp_rewrite WordPress Rewrite object.
*/ */
function twentyfourteen_paging_nav() { function twentyfourteen_paging_nav() {
global $wp_query, $wp_rewrite;
// Don't print empty markup if there's only one page. // Don't print empty markup if there's only one page.
if ( $GLOBALS['wp_query']->max_num_pages < 2 ) { if ( $wp_query->max_num_pages < 2 ) {
return; return;
} }
@ -31,14 +36,14 @@ function twentyfourteen_paging_nav() {
$pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link ); $pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
$pagenum_link = trailingslashit( $pagenum_link ) . '%_%'; $pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
$format = $GLOBALS['wp_rewrite']->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : ''; $format = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
$format .= $GLOBALS['wp_rewrite']->using_permalinks() ? user_trailingslashit( 'page/%#%', 'paged' ) : '?paged=%#%'; $format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
// Set up paginated links. // Set up paginated links.
$links = paginate_links( array( $links = paginate_links( array(
'base' => $pagenum_link, 'base' => $pagenum_link,
'format' => $format, 'format' => $format,
'total' => $GLOBALS['wp_query']->max_num_pages, 'total' => $wp_query->max_num_pages,
'current' => $paged, 'current' => $paged,
'mid_size' => 1, 'mid_size' => 1,
'add_args' => array_map( 'urlencode', $query_args ), 'add_args' => array_map( 'urlencode', $query_args ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.0-alpha-20140530'; $wp_version = '4.0-alpha-20140531';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.