Merge branch '6475-sql-query-builder-in-listform_actions-inc-php-failure' into 'develop'

Till Brehm · Till Brehm · commit 05b848e770dd · 2023-03-09T14:29:21.000Z
Resolve "SQL query builder in listform_actions.inc.php failure"

Closes #6475

See merge request ispconfig/ispconfig3!1702
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
@@ -226,7 +226,7 @@ public function getQueryString($no_limit = false) {
 		}
 
 		$sql_where = $app->listform->getSearchSQL($sql_where);
-		if(isset($app->listform->listDef['join_sql'])) $sql_where .= ' AND '.$app->listform->listDef['join_sql'];
+		if(isset($app->listform->listDef['join_sql']) && $app->listform->listDef['join_sql'] != '') $sql_where .= ' AND '.$app->listform->listDef['join_sql'];
 		$app->tpl->setVar($app->listform->searchValues);
 
 		$order_by_sql = $this->SQLOrderBy;

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public function getQueryString($no_limit = false) {`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`$sql_where = $app->listform->getSearchSQL($sql_where);`
`229`		`- if(isset($app->listform->listDef['join_sql'])) $sql_where .= ' AND '.$app->listform->listDef['join_sql'];`
	`229`	`+ if(isset($app->listform->listDef['join_sql']) && $app->listform->listDef['join_sql'] != '') $sql_where .= ' AND '.$app->listform->listDef['join_sql'];`
`230`	`230`	`$app->tpl->setVar($app->listform->searchValues);`
`231`	`231`
`232`	`232`	`$order_by_sql = $this->SQLOrderBy;`