Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r4880 -r4899
--- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 4880)
+++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 4899)
@@ -273,7 +273,7 @@
if (is_array($hooks) && count($hooks) > 0) {
foreach ($hooks as $hook) {
if (isset($config['ParentPrefix']) && $hook['HookToPrefix'] == $config['ParentPrefix']) {
- trigger_error('Depricated Hook Usage [prefix: '.$config['Prefix'].'; do_prefix: '.$hook['DoPrefix'].'] use #PARENT# and HookToPrefix value where HookToPrefix is same as ParentPrefix', E_USER_NOTICE);
+ trigger_error('Depricated Hook Usage [prefix: '.$config['Prefix'].'; do_prefix: '.$hook['DoPrefix'].'] use #PARENT# as HookToPrefix value, where HookToPrefix is same as ParentPrefix', E_USER_NOTICE);
}
if ($hook['HookToPrefix'] == '') {
@@ -310,6 +310,15 @@
if ( is_array(getArrayValue($config, 'AggregateTags')) ) {
foreach ($config['AggregateTags'] as $aggregate_tag) {
+ if (isset($config['ParentPrefix'])) {
+ if ($aggregate_tag['AggregateTo'] == $config['ParentPrefix']) {
+ trigger_error('Depricated Aggregate Tag Usage [prefix: '.$config['Prefix'].'; AggregateTo: '.$aggregate_tag['AggregateTo'].'] use #PARENT# as AggregateTo value, where AggregateTo is same as ParentPrefix', E_USER_NOTICE);
+ }
+
+ if ($aggregate_tag['AggregateTo'] == '#PARENT#') {
+ $aggregate_tag['AggregateTo'] = $config['ParentPrefix'];
+ }
+ }
$aggregate_tag['LocalPrefix'] = $config['Prefix'];
$this->Application->registerAggregateTag($aggregate_tag);
}