fixed: calendar viz: popup in ff was showing invalid date, and db joi…

…ns elements used as labels were showing raw values not label data
Fabrik · Dec 4, 2013 · 141d97f · 141d97f
1 parent 63da972
commit 141d97f
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/plugins/fabrik_visualization/calendar/models/calendar.php b/plugins/fabrik_visualization/calendar/models/calendar.php
@@ -443,12 +443,7 @@ public function getEvents()
 				$enddate = trim($data['enddate']) !== '' ? FabrikString::safeColName($data['enddate']) : "''";
 				$label = trim($data['label']) !== '' ? FabrikString::safeColName($data['label']) : "''";
 				$customUrl = $data['customUrl'];
-				/**
-				 * $$$ hugh @FIXME - $label has already been quoted, so quoting it again meant the array_key_exists
-				 * check was never matching, as the name got double quoted.
-				 * But ... the code that isn't running is broken, so for now ... If It Ain't Working, Don't Fix It :)
-				 */
-				$qlabel = $db->quoteName($label);
+				$qlabel = $label;
 
 				if (array_key_exists($qlabel, $els))
 				{
@@ -503,7 +498,7 @@ public function getEvents()
 								$date = JFactory::getDate($row->startdate);
 								$row->startdate = $date->format('Y-m-d H:i:s', true);
 								$date->setTimezone($tz);
-								$row->startdate_locale = $date->format('Y-m-d H:i:s', true);
+								$row->startdate_locale = $date->toISO8601(true);
 
 							}
 
@@ -514,7 +509,7 @@ public function getEvents()
 									$date = JFactory::getDate($row->enddate);
 									$row->enddate = $date->format('Y-m-d H:i:d');
 									$date->setTimezone($tz);
-									$row->enddate_locale = $date->format('Y-m-d H:i:d', true);
+									$row->enddate_locale = $date->toISO8601(true);
 								}
 							}
 							else