Index: branches/5.2.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r16758 -r16760
--- branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16758)
+++ branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16760)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 16758 2023-11-13 08:43:02Z alex $
+* @version	$Id: dblist.php 16760 2023-11-14 08:33:00Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -725,6 +725,10 @@
 	 */
 	public function extractCalculatedFields($clause, $aggregated = 1, $replace_table = false)
 	{
+		if ( !$clause ) {
+			return '';
+		}
+
 		$fields = $this->getCalculatedFields($aggregated);
 
 		if ( is_array($fields) && count($fields) > 0 ) {
@@ -759,23 +763,18 @@
 
 		if (!$system_filters_only) {
 			$where->addFilter('view_where', $this->WhereFilter[self::FLT_VIEW] );
+
+			// Handle general grid search filter. Append transformed having clause into where clause.
 			$search_w = $this->WhereFilter[self::FLT_SEARCH]->getSQL();
+			$search_h = $this->extractCalculatedFields($this->HavingFilter[self::FLT_SEARCH]->getSQL());
+			$search_w = ($search_w && $search_h) ? $search_w . ' OR ' . $search_h : $search_w . $search_h;
+			$where->addFilter('search_where', $search_w);
 
-			if ($search_w || $for_counting) { // move search_having to search_where in case search_where isset or we are counting
-				$search_h = $this->extractCalculatedFields( $this->HavingFilter[self::FLT_SEARCH]->getSQL() );
-				$search_w = ($search_w && $search_h) ? $search_w.' OR '.$search_h : $search_w.$search_h;
-				$where->addFilter('search_where', $search_w );
-			}
-
-			// CUSTOM
+			// Handle custom per-column grid filters. Append transformed having clause into where clause.
 			$search_w = $this->WhereFilter[self::FLT_CUSTOM]->getSQL();
-
-			if ($search_w || $for_counting) { // move search_having to search_where in case search_where isset or we are counting
-				$search_h = $this->extractCalculatedFields( $this->HavingFilter[self::FLT_CUSTOM]->getSQL() );
-				$search_w = ($search_w && $search_h) ? $search_w.' AND '.$search_h : $search_w.$search_h;
-				$where->addFilter('custom_where', $search_w );
-			}
-			// CUSTOM
+			$search_h = $this->extractCalculatedFields($this->HavingFilter[self::FLT_CUSTOM]->getSQL());
+			$search_w = ($search_w && $search_h) ? $search_w . ' AND ' . $search_h : $search_w . $search_h;
+			$where->addFilter('custom_where', $search_w);
 		}
 
 		if( $for_counting ) // add system_having and view_having to where
@@ -821,12 +820,8 @@
 		}
 
 		if (!$system_filters_only) {
+			// Don't add search/custom having filters here, because they're added to the where clause.
 			$having->addFilter('view_having', $this->HavingFilter[kDBList::FLT_VIEW] );
-			$having->addFilter('custom_having', $this->HavingFilter[kDBList::FLT_CUSTOM] );
-			$search_w = $this->WhereFilter[kDBList::FLT_SEARCH]->getSQL();
-			if (!$search_w) {
-				$having->addFilter('search_having', $this->HavingFilter[kDBList::FLT_SEARCH] );
-			}
 		}
 
 		return $having->getSQL();