Index: trunk/kernel/admin_templates/img/icons/icon46_payment_types.gif
===================================================================
diff -u -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_manufacturers.gif
===================================================================
diff -u -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_products.gif
===================================================================
diff -u -r1566 -r4794
Binary files differ
Index: trunk/core/kernel/utility/factory.php
===================================================================
diff -u -r4762 -r4794
--- trunk/core/kernel/utility/factory.php (.../factory.php) (revision 4762)
+++ trunk/core/kernel/utility/factory.php (.../factory.php) (revision 4794)
@@ -294,6 +294,10 @@
{
$dependencies =& $this->Dependencies[$depended_class];
+ if ($class_name == 'kFormatter') {
+ echo '';
+ }
+
$conditions = Array();
$conditions['exists'] = is_array($dependencies) && in_array($this->realClasses[$class_name], $dependencies);
$conditions['same_class'] = $this->realClasses[$class_name] == $depended_class;
Index: trunk/kernel/admin_templates/img/icons/icon46_orders.gif
===================================================================
diff -u -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_affiliates.gif
===================================================================
diff -u -r2399 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_payment_log.gif
===================================================================
diff -u -r2458 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_download_log.gif
===================================================================
diff -u -r2343 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_affiliate_payment_types.gif
===================================================================
diff -u -r2638 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_shipping.gif
===================================================================
diff -u -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_currencies.gif
===================================================================
diff -u -r1566 -r4794
Binary files differ
Index: trunk/kernel/admin_templates/img/icons/icon46_discounts.gif
===================================================================
diff -u -r1566 -r4794
Binary files differ
Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r4792 -r4794
--- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 4792)
+++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 4794)
@@ -221,6 +221,10 @@
$config =& $this->configData[$prefix];
$event_manager =& $this->Application->recallObject('EventManager');
+ if ($prefix == 'formatters') {
+ echo '';
+ }
+
$register_classes = getArrayValue($config,'RegisterClasses');
if (!$register_classes) $register_classes = Array();
$class_params=Array('ItemClass','ListClass','EventHandlerClass','TagProcessorClass');
@@ -361,7 +365,7 @@
if ($config_key == 'AggregateConfigs') {
$processed = array_merge($this->postProcessConfig($sub_prefix, 'Clones', 'prefix'), $processed);
}
- else {
+ elseif ($this->ProcessAllConfigs) {
$this->parseConfig($sub_prefix);
}
array_push($processed, $sub_prefix);
Index: trunk/kernel/units/admin/admin_tag_processor.php
===================================================================
diff -u -r4735 -r4794
--- trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4735)
+++ trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4794)
@@ -318,7 +318,7 @@
$block_params = Array('name' => $params['render_as']);
ksort($section_data['children'], SORT_NUMERIC);
foreach ($section_data['children'] as $priority => $section_name) {
- if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
+// if (!$this->Application->CheckPermission($section_name.'.view', 1)) continue;
$tab_data =& $sections_helper->getSectionData($section_name);
$block_params['t'] = $tab_data['url']['t'];
Index: trunk/kernel/admin_templates/config/config_email.tpl
===================================================================
diff -u -r4674 -r4794
--- trunk/kernel/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 4674)
+++ trunk/kernel/admin_templates/config/config_email.tpl (.../config_email.tpl) (revision 4794)
@@ -2,7 +2,7 @@