Version 4.7.23

system/Helpers/Chart/Dynamic.php

@@ -417,7 +417,7 @@ abstract class _Dynamic extends \IPS\Helpers\Chart
 				
 				$custom = array();
 				$chartFilters = ( isset( \IPS\Request::i()->chartFilters ) and \IPS\Request::i()->chartFilters ) ? \IPS\Request::i()->chartFilters : array();
-				$this->timescale = $chart['chart_timescale'] ?? 'monthly';
+				$this->timescale = ( isset( \IPS\Request::i()->timescale ) and \IPS\Request::i()->timescale[ $this->identifier ] ) ? \IPS\Request::i()->timescale[ $this->identifier ] : $chart['chart_timescale'] ?? 'monthly';
 				
 				foreach( \IPS\Request::i() as $key => $value )
 				{
@@ -779,7 +779,15 @@ abstract class _Dynamic extends \IPS\Helpers\Chart
 					
 					/* Anything else can just save as-is */
 					default:
-						$save[] = $row[$i];
+						if ( \is_array( $row[$i] ) )
+						{
+							/* GeoCharts use arrays so we need to use the value rather */
+							$save[] = $row[$i]['value'];
+						}
+						else
+						{
+							$save[] = $row[$i];
+						}
 						break;
 				}
 				$i++;