Changeset View
Changeset View
Standalone View
Standalone View
core/kernel/db/dblist.php
| Show First 20 Lines • Show All 584 Lines • ▼ Show 20 Line(s) | |||||
| $fields[$field_name] = $totals.'('.$field_expression.') AS '.$field_name.'_'.$totals; | $fields[$field_name] = $totals.'('.$field_expression.') AS '.$field_name.'_'.$totals; | ||||
| } | } | ||||
| } | } | ||||
| if (!$fields) { | if (!$fields) { | ||||
| return ; | return ; | ||||
| } | } | ||||
| $sql = $this->GetSelectSQL(true, false); | |||||
| $fields = str_replace('%1$s', $this->TableName, implode(', ', $fields)); | $fields = str_replace('%1$s', $this->TableName, implode(', ', $fields)); | ||||
| $sql = $this->GetSelectSQL(true, false, $fields); | |||||
| if ( preg_match("/DISTINCT(.*?\s)FROM(?!_)/is",$sql,$regs ) ) | if ( preg_match("/DISTINCT(.*?\s)FROM(?!_)/is",$sql,$regs ) ) | ||||
| { | { | ||||
| $sql = preg_replace("/^\s*SELECT DISTINCT(.*?\s)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql); | $sql = preg_replace("/^\s*SELECT DISTINCT(.*?\s)FROM(?!_)/is", 'SELECT '.$fields.' FROM', $sql); | ||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| $sql = preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql); | $sql = preg_replace("/^\s*SELECT(.*?\s)FROM(?!_)/is", 'SELECT '.$fields.' FROM ', $sql); | ||||
| ▲ Show 20 Lines • Show All 1167 Lines • Show Last 20 Lines | |||||