Make default_driver property static, fix undefined index warning.

hellifiknow · Apr 13, 2016 · 9719e0f · 9719e0f
1 parent f937e02
commit 9719e0f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/classes/report_types/MysqlReportType.php b/classes/report_types/MysqlReportType.php
@@ -1,4 +1,4 @@
 <?php
 class MysqlReportType extends PdoReportType {
-	public $default_driver = 'mysql';
+	public static $default_driver = 'mysql';
 }
diff --git a/classes/report_types/PdoReportType.php b/classes/report_types/PdoReportType.php
@@ -1,6 +1,6 @@
 <?php
 class PdoReportType extends ReportTypeBase {
-	public $default_driver = null;
+	public static $default_driver = null;
 
 	public static function init(&$report) {
 		$environments = PhpReports::$config['environments'];

diff --git a/lib/PhpReports/Report.php b/lib/PhpReports/Report.php
@@ -489,8 +489,10 @@ protected function prepareDataSets() {
 		foreach($this->options['DataSets'] as $i=>$dataset) {
 			$this->prepareRows($i);
 		}
-		$this->options['Rows'] = $this->options['DataSets'][0]['rows'];
-		$this->options['Count'] = $this->options['DataSets'][0]['count'];
+		if(isset($this->options['DataSets'][0])) {
+			$this->options['Rows'] = $this->options['DataSets'][0]['rows'];
+			$this->options['Count'] = $this->options['DataSets'][0]['count'];
+		}
 	}
 	protected function prepareRows($dataset) {
 		$rows = array();