Index: branches/5.2.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r16513 -r16644
--- branches/5.2.x/core/kernel/db/dblist.php (.../dblist.php) (revision 16513)
+++ branches/5.2.x/core/kernel/db/dblist.php (.../dblist.php) (revision 16644)
@@ -1,6 +1,6 @@
getTotal($field, $total_function);
$formatter_class = $this->GetFieldOption($field, 'formatter');
@@ -674,7 +675,7 @@
/** @var kFormatter $formatter */
$formatter = $this->Application->recallObject($formatter_class);
- $res = $formatter->Format($res, $field, $this);
+ $res = $formatter->Format($res, $field, $this, $format);
}
return $res;
Index: branches/5.2.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r16554 -r16644
--- branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 16554)
+++ branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 16644)
@@ -1,6 +1,6 @@
setTotal($field, $total_function, $value);
}
- $value = $list->GetFormattedTotal($field, $total_function);
+ $format = array_key_exists('format', $params) ? $params['format'] : false;
+ if ( !$format || $format == '$format' ) {
+ $format = null;
+ }
+
+ $value = $list->GetFormattedTotal($field, $total_function, $format);
+
if (array_key_exists('currency', $params) && $params['currency']) {
$value = $this->AddCurrencySymbol($value, $iso);
}
Index: branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r16602 -r16644
--- branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 16602)
+++ branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 16644)
@@ -187,9 +187,9 @@
-
+
-
+