(OC) tried fixing the insert in NewAdmin(), no luck

git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@394 c5b2fb0a-d05d-0410-98c8-828840a80ff6

1 files changed, 3 insertions, 2 deletions

diff --git a/blocks/mini_calendar/functions.php b/blocks/mini_calendar/functions.php
index 3291e6b..0dee840 100644
--- a/blocks/mini_calendar/functions.php
+++ b/blocks/mini_calendar/functions.php
@@ -252,7 +252,7 @@
 		       $isEvent=false;

 

 			 	global $db;

-		  		$result = $db->Query("SELECT title,color FROM `bayonet_events` WHERE `date` = '$sqlDate' ORDER BY `date` DESC");

+		  		$result = $db->Query("SELECT title,color,date,time FROM `bayonet_events` WHERE `date` = '$sqlDate' ORDER BY `date` DESC");

 		  		while(($row = $db->Fetch($result))!=false)

 		  		{

 		    		$isEvent = true;

@@ -301,7 +301,8 @@
 	if(count($todaysEvents)>0){

 		echo "<h3>Today's Events</h3>";

 		foreach($todaysEvents as $event){

-			echo "<span style=\"background-color: {$event['color']}\">&nbsp;&nbsp;</span>&nbsp;{$event['title']}<br />";

+			$time = date("g:i a", strtotime($event['date']." ".$event['time']));

+			echo "<span style=\"background-color: {$event['color']}\">&nbsp;&nbsp;</span>&nbsp;{$event['title']} @ {$time}<br />";

 		}

 	}

  }