back to localtime, also using :59 instead of :00 should be better and still make use of mysql's query cache

git-svn-id: http://svn.automattic.com/wordpress/trunk@1000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
michelvaldrighi 2004-03-25 02:15:36 +00:00
parent 79fa8206c1
commit d295a6290b
1 changed files with 14 additions and 14 deletions

View File

@ -116,38 +116,38 @@ if (isset($showposts) && $showposts) {
$add_hours = intval($time_difference); $add_hours = intval($time_difference);
$add_minutes = intval(60 * ($time_difference - $add_hours)); $add_minutes = intval(60 * ($time_difference - $add_hours));
$wp_posts_post_date_field = "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)"; $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)";
// if a month is specified in the querystring, load that month // if a month is specified in the querystring, load that month
if ($m != '') { if ($m != '') {
$m = ''.intval($m); $m = ''.intval($m);
$where .= " AND YEAR($wp_posts_post_date_field)=".substr($m,0,4); $where .= ' AND YEAR(post_date)='.substr($m,0,4);
if (strlen($m)>5) if (strlen($m)>5)
$where .= " AND MONTH($wp_posts_post_date_field)=".substr($m,4,2); $where .= ' AND MONTH(post_date)='.substr($m,4,2);
if (strlen($m)>7) if (strlen($m)>7)
$where .= " AND DAYOFMONTH($wp_posts_post_date_field)=".substr($m,6,2); $where .= ' AND DAYOFMONTH(post_date)='.substr($m,6,2);
if (strlen($m)>9) if (strlen($m)>9)
$where .= " AND HOUR($wp_posts_post_date_field.)=".substr($m,8,2); $where .= ' AND HOUR(post_date.)='.substr($m,8,2);
if (strlen($m)>11) if (strlen($m)>11)
$where .= " AND MINUTE($wp_posts_post_date_field)=".substr($m,10,2); $where .= ' AND MINUTE(post_date)='.substr($m,10,2);
if (strlen($m)>13) if (strlen($m)>13)
$where .= " AND SECOND($wp_posts_post_date_field)=".substr($m,12,2); $where .= ' AND SECOND(post_date)='.substr($m,12,2);
} }
if ($year != '') { if ($year != '') {
$year = '' . intval($year); $year = '' . intval($year);
$where .= " AND YEAR($wp_posts_post_date_field)='$year'"; $where .= " AND YEAR(post_date)='$year'";
} }
if ($monthnum != '') { if ($monthnum != '') {
$monthnum = '' . intval($monthnum); $monthnum = '' . intval($monthnum);
$where .= " AND MONTH($wp_posts_post_date_field)='$monthnum'"; $where .= " AND MONTH(post_date)='$monthnum'";
} }
if ($day != '') { if ($day != '') {
$day = '' . intval($day); $day = '' . intval($day);
$where .= " AND DAYOFMONTH($wp_posts_post_date_field)='$day'"; $where .= " AND DAYOFMONTH(post_date)='$day'";
} }
if ($name != '') { if ($name != '') {
@ -157,7 +157,7 @@ if ($name != '') {
if ($w != '') { if ($w != '') {
$w = ''.intval($w); $w = ''.intval($w);
$where .= " AND WEEK($wp_posts_post_date_field, 1)='$w'"; $where .= " AND WEEK(post_date, 1)='$w'";
} }
// if a post number is specified, load that post // if a post number is specified, load that post
@ -337,7 +337,7 @@ if ((!$whichcat) && (!$m) && (!$p) && (!$w) && (!$s) && empty($poststart) && emp
$lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate); $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
$lastpostdate = mysql2date('U',$lastpostdate); $lastpostdate = mysql2date('U',$lastpostdate);
$otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($posts_per_page-1) * 86400))); $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($posts_per_page-1) * 86400)));
$where .= " AND $wp_posts_post_date_field > '$otherdate'"; $where .= " AND post_date > '$otherdate'";
} }
} }
@ -356,7 +356,7 @@ if ( !empty($postend) && ($postend > $poststart) && (!$m) && empty($monthnum) &&
$lastpostdate = mysql2date('U',$lastpostdate); $lastpostdate = mysql2date('U',$lastpostdate);
$startdate = date('Y-m-d H:i:s', ($lastpostdate - (($poststart -1) * 86400))); $startdate = date('Y-m-d H:i:s', ($lastpostdate - (($poststart -1) * 86400)));
$otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($postend -1) * 86400))); $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($postend -1) * 86400)));
$where .= " AND $wp_posts_post_date_field > '$otherdate' AND $wp_posts_post_date_field < '$startdate'"; $where .= " AND post_date > '$otherdate' AND post_date < '$startdate'";
} }
} else { } else {
if (($what_to_show == 'paged') && (!$p) && (!$more)) { if (($what_to_show == 'paged') && (!$p) && (!$more)) {
@ -387,7 +387,7 @@ if ($p == 'all') {
$where = ''; $where = '';
} }
$now = gmdate('Y-m-d H:i:00'); $now = gmdate('Y-m-d H:i:59', time() + ($time_difference * 3600));
if ($pagenow != 'post.php' && $pagenow != 'edit.php') { if ($pagenow != 'post.php' && $pagenow != 'edit.php') {
if ((empty($poststart)) || (empty($postend)) || !($postend > $poststart)) { if ((empty($poststart)) || (empty($postend)) || !($postend > $poststart)) {