Changeset View
Changeset View
Standalone View
Standalone View
branches/5.2.x/core/kernel/db/dblist.php
| Show First 20 Lines • Show All 730 Lines • ▼ Show 20 Line(s) | |||||
| * @return string | * @return string | ||||
| * @access public | * @access public | ||||
| */ | */ | ||||
| public function extractCalculatedFields($clause, $aggregated = 1, $replace_table = false) | public function extractCalculatedFields($clause, $aggregated = 1, $replace_table = false) | ||||
| { | { | ||||
| $fields = $this->getCalculatedFields($aggregated); | $fields = $this->getCalculatedFields($aggregated); | ||||
| if ( is_array($fields) && count($fields) > 0 ) { | 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) { | foreach ($fields as $field_name => $field_expression) { | ||||
| $clause = preg_replace('/(\\(+)[(,` ]*' . $field_name . '[` ]{1}/', '\1 (' . $field_expression . ') ', $clause); | $clause = preg_replace('/(\\(+)[(,` ]*' . $field_name . '[` ]{1}/', '\1 (' . $field_expression . ') ', $clause); | ||||
| $clause = preg_replace('/[,` ]{1}' . $field_name . '[` ]{1}/', ' (' . $field_expression . ') ', $clause); | $clause = preg_replace('/[,` ]{1}' . $field_name . '[` ]{1}/', ' (' . $field_expression . ') ', $clause); | ||||
| } | } | ||||
| } | } | ||||
| return $replace_table ? str_replace('%1$s', $this->TableName, $clause) : $clause; | return $replace_table ? str_replace('%1$s', $this->TableName, $clause) : $clause; | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 1032 Lines • Show Last 20 Lines | |||||