Version 5.0.13

system/Helpers/Chart/Callback.php

@@ -12,6 +12,7 @@ namespace IPS\Helpers\Chart;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
 
+use DateInterval;
 use DateTimeZone;
 use Exception;
 use IPS\DateTime;
@@ -153,8 +154,36 @@ class Callback extends Dynamic
 				{
 					$result[ $column ]	= $row[ $column ];
 				}
-	
-				$data[ $row['time'] ] = $result;
+
+
+				$time = $row['time'];
+
+				// UNIX timestamps are sometimes passed in. In this case, we try to make sure the timestamp format matches the defaults added via $this->initData()
+				if ( is_int( $time ) )
+				{
+					$date = DateTime::ts( $time );
+					switch ( $this->timescale )
+					{
+						case 'hourly':
+							$time = $date->format( 'Y-n-j-h-i-s' );
+							break;
+
+						case 'daily':
+							$time = $date->format( 'Y-n-j' );
+							break;
+
+						case 'weekly':
+							/* o is the ISO year number, which we need when years roll over.
+								@see http://php.net/manual/en/function.date.php#106974 */
+							$time = $date->format( 'o-W' );
+							break;
+
+						case 'monthly':
+							$time = $date->format( 'Y-n' );
+							break;
+					}
+				}
+				$data[ $time ] = $result;
 			}
 
 			ksort( $data, SORT_NATURAL );