Ticket #30994: #30944_offsetreturn_wpgetarchives.diff

wp-includes/general-template.php

@@ -1317 +1317 @@
  *     @type bool|int   $echo            Whether to echo or return the links list. Default 1|true to echo.
  *     @type string     $order           Whether to use ascending or descending order. Accepts 'ASC', or 'DESC'.
  *                                       Default 'DESC'.
+ *     @type string|int $offset          Number of links to offset the query. Default empty.
  * }
  * @return string|null String when retrieving, null when displaying.
  */
@@ -1328 +1329 @@
                 'format' => 'html', 'before' => '',
                 'after' => '', 'show_post_count' => false,
                 'echo' => 1, 'order' => 'DESC',
+                'offset' => '',
         );
 
         $r = wp_parse_args( $args, $defaults );
@@ -1346 +1348 @@
                 $order = 'DESC';
         }
 
+        if ( ! empty( $r['offset'] ) ) {
+                $r['offset'] = absint( $r['offset'] );
+                $r['offset'] = ' OFFSET ' . $r['offset'];
+                if ( empty( $r['limit'] ) ) {
+                        $r['limit'] = ' LIMIT ' . PHP_INT_MAX;
+                }
+        }
+
         // this is what will separate dates on weekly archive links
         $archive_week_separator = '–';
 
@@ -1395 +1405 @@
 
         $limit = $r['limit'];
 
+        $offset = $r['offset'];
+
         if ( 'monthly' == $r['type'] ) {
-                $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
+                $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit $offset";
                 $key = md5( $query );
                 $key = "wp_get_archives:$key:$last_changed";
                 if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
@@ -1416 +1428 @@
                         }
                 }
         } elseif ( 'yearly' == $r['type'] ) {
-                $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
+                $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit $offset";
                 $key = md5( $query );
                 $key = "wp_get_archives:$key:$last_changed";
                 if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
@@ -1435 +1447 @@
                         }
                 }
         } elseif ( 'daily' == $r['type'] ) {
-                $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
+                $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit $offset";
                 $key = md5( $query );
                 $key = "wp_get_archives:$key:$last_changed";
                 if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
@@ -1456 +1468 @@
                 }
         } elseif ( 'weekly' == $r['type'] ) {
                 $week = _wp_mysql_week( '`post_date`' );
-                $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
+                $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit $offset";
                 $key = md5( $query );
                 $key = "wp_get_archives:$key:$last_changed";
                 if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
@@ -1484 +1496 @@
                 }
         } elseif ( ( 'postbypost' == $r['type'] ) || ('alpha' == $r['type'] ) ) {
                 $orderby = ( 'alpha' == $r['type'] ) ? 'post_title ASC ' : 'post_date DESC ';
-                $query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
+                $query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit $offset";
                 $key = md5( $query );
                 $key = "wp_get_archives:$key:$last_changed";
                 if ( ! $results = wp_cache_get( $key, 'posts' ) ) {