D144.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/core/kernel/db/dblist.php
	===================================================================
	--- branches/5.2.x/core/kernel/db/dblist.php
	+++ branches/5.2.x/core/kernel/db/dblist.php
	@@ -736,6 +736,8 @@
	$fields = $this->getCalculatedFields($aggregated);

	if ( is_array($fields) && count($fields) > 0 ) {
	+ $fields = str_replace('%2$s', $this->Application->GetVar('m_lang'), $fields);
	+
	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);