Index: trunk/core/kernel/db/dblist.php
===================================================================
diff -u -r4287 -r4899
--- trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 4287)
+++ trunk/core/kernel/db/dblist.php (.../dblist.php) (revision 4899)
@@ -557,8 +557,7 @@
$field = 'l'.$lang.'_'.$field;
}
- if( !isset($this->Fields[$field]) )
- {
+ if (!isset($this->Fields[$field]) && ($field != 'RAND()')) {
trigger_error('Incorrect sorting defined (field = '.$field.'; direction = '.$direction.') in config for prefix '.$this->Prefix.'', E_USER_WARNING);
}
Index: trunk/core/units/images/images_config.php
===================================================================
diff -u -r4314 -r4899
--- trunk/core/units/images/images_config.php (.../images_config.php) (revision 4314)
+++ trunk/core/units/images/images_config.php (.../images_config.php) (revision 4899)
@@ -7,54 +7,34 @@
'n-img' => Array('ParentPrefix' => 'n'),
'bb-img'=> Array('ParentPrefix' => 'bb'),
/*'p-img' => Array('ParentPrefix' => 'p'),*/
-
- 'catimg' => Array(
- 'ParentPrefix' => 'c',
- 'AggregateTags' => Array(
- Array(
- 'AggregateTo' => 'c',
- 'AggregatedTagName' => 'Image',
- 'LocalTagName' => 'ItemImage',
- ),
- Array(
- 'AggregateTo' => 'c',
- 'AggregatedTagName' => 'ListImages',
- 'LocalTagName' => 'PrintList2',
- 'LocalSpecial' => 'list',
- ),
- Array(
- 'AggregateTo' => 'c',
- 'AggregatedTagName' => 'LargeImageExists',
- 'LocalTagName' => 'LargeImageExists',
- ),
- ),
- )
- ),
+ 'catimg' => Array('ParentPrefix' => 'c'),
+ ),
+
'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
'EventHandlerClass' => Array('class'=>'ImageEventHandler','file'=>'image_event_handler.php','build_event'=>'OnBuild'),
'TagProcessorClass' => Array('class'=>'ImageTagProcessor','file'=>'image_tag_processor.php','build_event'=>'OnBuild'),
'AutoLoad' => true,
- 'hooks' => Array(),
+
'AggregateTags' => Array(
- Array(
- 'AggregateTo' => 'p',
- 'AggregatedTagName' => 'Image',
- 'LocalTagName' => 'ItemImage',
- ),
- Array(
- 'AggregateTo' => 'p',
- 'AggregatedTagName' => 'ListImages',
- 'LocalTagName' => 'PrintList2',
- 'LocalSpecial' => 'list',
- ),
- Array(
- 'AggregateTo' => 'p',
- 'AggregatedTagName' => 'LargeImageExists',
- 'LocalTagName' => 'LargeImageExists',
- ),
-
- ),
+ Array(
+ 'AggregateTo' => '#PARENT#',
+ 'AggregatedTagName' => 'Image',
+ 'LocalTagName' => 'ItemImage',
+ ),
+ Array(
+ 'AggregateTo' => '#PARENT#',
+ 'AggregatedTagName' => 'ListImages',
+ 'LocalTagName' => 'PrintList2',
+ 'LocalSpecial' => 'list',
+ ),
+ Array(
+ 'AggregateTo' => '#PARENT#',
+ 'AggregatedTagName' => 'LargeImageExists',
+ 'LocalTagName' => 'LargeImageExists',
+ ),
+ ),
+
'QueryString' => Array(
1 => 'id',
2 => 'page',
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);
}
Index: trunk/kernel/units/images/images_config.php
===================================================================
diff -u -r4314 -r4899
--- trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 4314)
+++ trunk/kernel/units/images/images_config.php (.../images_config.php) (revision 4899)
@@ -7,54 +7,34 @@
'n-img' => Array('ParentPrefix' => 'n'),
'bb-img'=> Array('ParentPrefix' => 'bb'),
/*'p-img' => Array('ParentPrefix' => 'p'),*/
-
- 'catimg' => Array(
- 'ParentPrefix' => 'c',
- 'AggregateTags' => Array(
- Array(
- 'AggregateTo' => 'c',
- 'AggregatedTagName' => 'Image',
- 'LocalTagName' => 'ItemImage',
- ),
- Array(
- 'AggregateTo' => 'c',
- 'AggregatedTagName' => 'ListImages',
- 'LocalTagName' => 'PrintList2',
- 'LocalSpecial' => 'list',
- ),
- Array(
- 'AggregateTo' => 'c',
- 'AggregatedTagName' => 'LargeImageExists',
- 'LocalTagName' => 'LargeImageExists',
- ),
- ),
- )
- ),
+ 'catimg' => Array('ParentPrefix' => 'c'),
+ ),
+
'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
'EventHandlerClass' => Array('class'=>'ImageEventHandler','file'=>'image_event_handler.php','build_event'=>'OnBuild'),
'TagProcessorClass' => Array('class'=>'ImageTagProcessor','file'=>'image_tag_processor.php','build_event'=>'OnBuild'),
'AutoLoad' => true,
- 'hooks' => Array(),
+
'AggregateTags' => Array(
- Array(
- 'AggregateTo' => 'p',
- 'AggregatedTagName' => 'Image',
- 'LocalTagName' => 'ItemImage',
- ),
- Array(
- 'AggregateTo' => 'p',
- 'AggregatedTagName' => 'ListImages',
- 'LocalTagName' => 'PrintList2',
- 'LocalSpecial' => 'list',
- ),
- Array(
- 'AggregateTo' => 'p',
- 'AggregatedTagName' => 'LargeImageExists',
- 'LocalTagName' => 'LargeImageExists',
- ),
-
- ),
+ Array(
+ 'AggregateTo' => '#PARENT#',
+ 'AggregatedTagName' => 'Image',
+ 'LocalTagName' => 'ItemImage',
+ ),
+ Array(
+ 'AggregateTo' => '#PARENT#',
+ 'AggregatedTagName' => 'ListImages',
+ 'LocalTagName' => 'PrintList2',
+ 'LocalSpecial' => 'list',
+ ),
+ Array(
+ 'AggregateTo' => '#PARENT#',
+ 'AggregatedTagName' => 'LargeImageExists',
+ 'LocalTagName' => 'LargeImageExists',
+ ),
+ ),
+
'QueryString' => Array(
1 => 'id',
2 => 'page',