Changeset 28645

Timestamp:

05/31/2014 06:50:16 PM (11 years ago)

Author:

lancewillett

Message:

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.

File:

• trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php (modified) (3 diffs)

trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php

@@ -13 +13 @@
  *
  * @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() {
+    global $wp_query, $wp_rewrite;
+
     // 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;
     }
@@ -32 +37 @@
     $pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
 
-    $format  = $GLOBALS['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_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
+    $format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
 
     // Set up paginated links.
@@ -39 +44 @@
         'base'     => $pagenum_link,
         'format'   => $format,
-        'total'    => $GLOBALS['wp_query']->max_num_pages,
+        'total'    => $wp_query->max_num_pages,
         'current'  => $paged,
         'mid_size' => 1,