Merge pull request #495 from AlexKay85/master

reverted change that breaks 0 values from database
berliCRM · Jan 13, 2021 · 188afe1 · 188afe1
2 parents 59e247b + 2ac64f8
commit 188afe1
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/include/database/PearDatabase.php b/include/database/PearDatabase.php
@@ -679,13 +679,9 @@ function query_result(&$result, $row, $col=0) {
 		$rowdata = $this->change_key_case($result->FetchRow());
 		//$this->println($rowdata);
 		//Commented strip_selected_tags and added to_html function for HTML tags vulnerability
-		$coldata = '';
-		if($col!=0 && $col == 'fieldlabel') {
-			$coldata = $rowdata[$col];
-		}
-		else if (!empty($rowdata[$col])) {
-			$coldata = to_html($rowdata[$col]);
-		}
+		if($col == 'fieldlabel') $coldata = $rowdata[$col];
+		else $coldata = to_html($rowdata[$col]);
+
 		return $coldata;
     }