Version 4.7.23

system/Helpers/Chart/Database.php

@@ -61,6 +61,11 @@ class _Database extends \IPS\Helpers\Chart\Dynamic
 	 * @brief	Table Column Formatters
 	 */
 	public $tableParsers = array();
+	
+	/**
+	 * @brief	Table Lang Prefix
+	 */
+	public $tableLangPrefix = NULL;
 
 	/**
 	 * @brief   Along with the other series, show one of the sum of all
@@ -345,7 +350,7 @@ class _Database extends \IPS\Helpers\Chart\Dynamic
 				NULL,
 				NULL,
 				$this->groupBy
-			)->setKeyField( $this->groupBy )->setValueField( $key );
+			);
 
 			if( \count( $this->joins ) )
 			{
@@ -354,7 +359,10 @@ class _Database extends \IPS\Helpers\Chart\Dynamic
 					$stmt = $stmt->join( $join[0], $join[1], ( isset( $join[2] ) ? $join[2] : 'LEFT' ), ( isset( $join[3] ) ? $join[3] : FALSE ) );
 				}
 			}
-								
+
+			/* Calling this before the joins are added just executes the query and the joins are never added */
+			$stmt->setKeyField( $this->groupBy )->setValueField( $key );
+
 			foreach ( $stmt as $k => $v )
 			{
 				if( \count( $this->availableFilters ) and !\in_array( $k, $this->currentFilters ) )
@@ -581,6 +589,10 @@ class _Database extends \IPS\Helpers\Chart\Dynamic
 			{
 				$table->include = $this->tableInclude;
 			}
+			if ( $this->tableLangPrefix )
+			{
+				$table->langPrefix = $this->tableLangPrefix;
+			}
 			$table->parsers = $this->tableParsers;
 			$table->sortBy = $table->sortBy ?: $this->dateField;