--- mambo/branches/4.6/components/com_content/content.php	2006/12/01 14:24:11	802
+++ mambo/branches/4.6/components/com_content/content.php	2006/12/04 09:11:18	806
@@ -1023,6 +1023,8 @@
 			. "\n WHERE a.catid = ". $row->catid.""
 			. "\n AND a.state = $row->state AND ordering < $row->ordering"
 			. ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
+			. "\n AND ( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )"
+			. "\n AND ( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )"
 			. "\n ORDER BY a.ordering DESC"
 			. "\n LIMIT 1"
 			;
@@ -1034,6 +1036,8 @@
 			. "\n WHERE a.catid = ". $row->catid.""
 			. "\n AND a.state = $row->state AND ordering > $row->ordering"
 			. ($access->canEdit ? "" : "\n AND a.access <= '". $gid ."'" )
+			. "\n AND ( a.publish_up = '0000-00-00 00:00:00' OR a.publish_up <= '". $now ."' )"
+			. "\n AND ( a.publish_down = '0000-00-00 00:00:00' OR a.publish_down >= '". $now ."' )"
 			. "\n ORDER BY a.ordering"
 			. "\n LIMIT 1"
 			;