Index: branches/5.2.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r14738 -r14865
--- branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 14738)
+++ branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 14865)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 14738 2011-11-07 20:06:56Z alex $
+* @version	$Id: dblist.php 14865 2011-12-13 15:13:51Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -714,19 +714,22 @@
 	 *
 	 * @param string $clause where clause to extract calculated fields from
 	 * @param int $aggregated 0 - having + aggregated, 1 - having only, 2 - aggregated only
+	 * @param bool $replace_table
 	 * @return string
 	 * @access public
 	 */
-	public function extractCalculatedFields($clause, $aggregated = 1)
+	public function extractCalculatedFields($clause, $aggregated = 1, $replace_table = false)
 	{
 		$fields = $this->getCalculatedFields($aggregated);
-		if (is_array($fields) && count($fields) > 0) {
+
+		if ( is_array($fields) && count($fields) > 0 ) {
 			foreach ($fields as $field_name => $field_expression) {
-				$clause = preg_replace('/(\\(+)[(,` ]*'.$field_name.'[` ]{1}/', '\1 ('.$field_expression.') ', $clause);
-				$clause = preg_replace('/[,` ]{1}'.$field_name.'[` ]{1}/', ' ('.$field_expression.') ', $clause);
+				$clause = preg_replace('/(\\(+)[(,` ]*' . $field_name . '[` ]{1}/', '\1 (' . $field_expression . ') ', $clause);
+				$clause = preg_replace('/[,` ]{1}' . $field_name . '[` ]{1}/', ' (' . $field_expression . ') ', $clause);
 			}
 		}
-		return $clause;
+
+		return $replace_table ? str_replace('%1$s', $this->TableName, $clause) : $clause;
 	}
 
 	/**