Index: trunk/admin/install/upgrades/readme_1_1_2.txt =================================================================== diff -u -N -r2561 -r2613 --- trunk/admin/install/upgrades/readme_1_1_2.txt (.../readme_1_1_2.txt) (revision 2561) +++ trunk/admin/install/upgrades/readme_1_1_2.txt (.../readme_1_1_2.txt) (revision 2613) @@ -1,4 +1,5 @@ 0008623 - Errors are not shown on password reset screen in default theme. 0008641 - new tag added 0008662 - "Delete All" button in search log in admin -0008467 - Admin, Item Edit -> Categories tab shows only first 20 categories. fixed. \ No newline at end of file +0008467 - Admin, Item Edit -> Categories tab shows only first 20 categories. fixed. +0008754 - added tag for category image and image list output \ No newline at end of file Index: trunk/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -N -r2604 -r2613 --- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 2604) +++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 2613) @@ -113,6 +113,22 @@ } } + function ParseConfigClones($prefix) + { + $config = $this->configData[$prefix]; + if(!getArrayValue($config, 'Clones')) + { + return; + } + unset($this->configData[$prefix]['Clones']); + foreach($config['Clones'] as $clone_prefix => $clone_config) + { + $clone_config['Prefix'] = $clone_prefix; + $this->configData[$clone_prefix] = array_merge_recursive2($this->configData[$prefix], $clone_config); + $this->ParseConfigClones($clone_prefix); + } + } + function ParseConfigs() { foreach ($this->configData as $prefix => $config) @@ -174,6 +190,7 @@ $prefix = $config['Prefix']; $config['BasePath'] = dirname(FULL_PATH.$filename); $this->configData[$prefix] = $config; + $this->ParseConfigClones($prefix); } } } Index: trunk/kernel/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r2586 -r2613 --- trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 2586) +++ trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 2613) @@ -130,8 +130,9 @@ { $block_params['name'] = $this->SelectParam($params,'render_as,block'); - $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $sql = 'SELECT CategoryId, ParentId, Name FROM '.$cat_object->TableName.' WHERE CategoryId='.$params['cat_id']; + // $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); + $sql = 'SELECT CategoryId, ParentId, Name FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').' + WHERE CategoryId='.$params['cat_id']; $res = $this->Conn->GetRow($sql); $block_params['cat_name'] = $res['Name']; Index: trunk/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r2586 -r2613 --- trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 2586) +++ trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 2613) @@ -130,8 +130,9 @@ { $block_params['name'] = $this->SelectParam($params,'render_as,block'); - $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $sql = 'SELECT CategoryId, ParentId, Name FROM '.$cat_object->TableName.' WHERE CategoryId='.$params['cat_id']; + // $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); + $sql = 'SELECT CategoryId, ParentId, Name FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').' + WHERE CategoryId='.$params['cat_id']; $res = $this->Conn->GetRow($sql); $block_params['cat_name'] = $res['Name'];