Changeset 3510 for trunk/wp-includes/template-functions-general.php

Timestamp:

02/09/2006 10:03:48 AM (19 years ago)

Author:

ryan

Message:

Allow draft pages. Use post_type for object types. Reserve post_status strictly for status. fixes #1820

File:

• trunk/wp-includes/template-functions-general.php (modified) (9 diffs)

trunk/wp-includes/template-functions-general.php

@@ -331 +331 @@
 
     if ( 'monthly' == $type ) {
-        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts WHERE post_date < '$now' AND post_date != '0000-00-00 00:00:00' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts WHERE post_date < '$now' AND post_date != '0000-00-00 00:00:00' AND post_type = 'post' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date DESC" . $limit);
         if ( $arcresults ) {
             $afterafter = $after;
@@ -346 +346 @@
         }
     } elseif ( 'daily' == $type ) {
-        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth` FROM $wpdb->posts WHERE post_date < '$now' AND post_date != '0000-00-00 00:00:00' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth` FROM $wpdb->posts WHERE post_date < '$now' AND post_date != '0000-00-00 00:00:00' AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
         if ( $arcresults ) {
             foreach ( $arcresults as $arcresult ) {
@@ -357 +357 @@
     } elseif ( 'weekly' == $type ) {
         $start_of_week = get_settings('start_of_week');
-        $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK(post_date, $start_of_week) AS `week`, YEAR(post_date) AS yr, DATE_FORMAT(post_date, '%Y-%m-%d') AS yyyymmdd FROM $wpdb->posts WHERE post_date < '$now' AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
         $arc_w_last = '';
         if ( $arcresults ) {
@@ -374 +374 @@
         }
     } elseif ( 'postbypost' == $type ) {
-        $arcresults = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
+        $arcresults = $wpdb->get_results("SELECT * FROM $wpdb->posts WHERE post_date < '$now' AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
         if ( $arcresults ) {
             foreach ( $arcresults as $arcresult ) {
@@ -404 +404 @@
     // Quick check. If we have no posts at all, abort!
     if ( !$posts ) {
-        $gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
+        $gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
         if ( !$gotsome )
             return;
@@ -444 +444 @@
         FROM $wpdb->posts
         WHERE post_date < '$thisyear-$thismonth-01'
-        AND post_status = 'publish'
+        AND post_type = 'post' AND post_status = 'publish'
             ORDER BY post_date DESC
             LIMIT 1");
@@ -451 +451 @@
         WHERE post_date >   '$thisyear-$thismonth-01'
         AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' )
-        AND post_status = 'publish' 
+        AND post_type = 'post' AND post_status = 'publish' 
             ORDER   BY post_date ASC
             LIMIT 1");
@@ -509 +509 @@
         FROM $wpdb->posts WHERE MONTH(post_date) = $thismonth
         AND YEAR(post_date) = $thisyear
-        AND post_status = 'publish'
+        AND post_type = 'post' AND post_status = 'publish'
         AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
     if ( $dayswithposts ) {
@@ -532 +532 @@
         ."AND MONTH(post_date) = '$thismonth' "
         ."AND post_date < '".current_time('mysql')."' "
-        ."AND post_status = 'publish'"
+        ."AND post_type = 'post' AND post_status = 'publish'"
     );
     if ( $ak_post_titles ) {