Index: trunk/core/kernel/kbase.php =================================================================== diff -u -r7391 -r7635 --- trunk/core/kernel/kbase.php (.../kbase.php) (revision 7391) +++ trunk/core/kernel/kbase.php (.../kbase.php) (revision 7635) @@ -51,7 +51,7 @@ */ function &makeClass() { - $object = new kBase(); + $object = new kBase(); return $object; } @@ -315,7 +315,7 @@ if ($fields) { $sql = Array(); foreach ($fields as $field_name => $field_expression) { - $sql[] = '('.$field_expression.') AS '.$field_name; + $sql[] = '('.$field_expression.') AS `'.$field_name.'`'; } $sql = implode(',',$sql); return $this->Application->ReplaceLanguageTags( str_replace('%2$s', ','.$sql, $query) ); @@ -520,12 +520,15 @@ } - function UpdateFormattersSubFields() + function UpdateFormattersSubFields($fields=null) { - foreach ($this->Fields as $field => $options) { - if (isset($options['formatter'])) { - $formatter =& $this->Application->recallObject($options['formatter']); - $formatter->UpdateSubFields($field, $this->GetDBField($field), $options, $this); + if (!is_array($fields)) { + $fields = array_keys($this->Fields); + } + foreach ($fields as $field) { + if ( isset($this->Fields[$field]['formatter']) ) { + $formatter =& $this->Application->recallObject($this->Fields[$field]['formatter']); + $formatter->UpdateSubFields($field, $this->GetDBField($field), $this->Fields[$field], $this); } } }