Index: branches/5.0.x/core/kernel/db/cat_tag_processor.php =================================================================== diff -u -r12343 -r12497 --- branches/5.0.x/core/kernel/db/cat_tag_processor.php (.../cat_tag_processor.php) (revision 12343) +++ branches/5.0.x/core/kernel/db/cat_tag_processor.php (.../cat_tag_processor.php) (revision 12497) @@ -1,6 +1,6 @@ Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params); + $grids = $this->Application->getUnitOption($this->Prefix, 'Grids'); + $grid = $grids[ $params['grid'] ]; - $grids = $this->Application->getUnitOption($this->Prefix,'Grids'); - $icons =& $grids[ $params['grid'] ]['Icons']; + if (!array_key_exists('Icons', $grid)) { + return ''; + } - $status_fields = $this->Application->getUnitOption($this->Prefix,'StatusField'); - if (!$status_fields) return $icons['default']; + $icons = $grid['Icons']; + if (array_key_exists('name', $params)) { + $icon_name = $params['name']; + return array_key_exists($icon_name, $icons) ? $icons[$icon_name] : ''; + } + + $status_fields = $this->Application->getUnitOption($this->Prefix, 'StatusField'); + + if (!$status_fields) { + return $icons['default']; + } + + $object =& $this->getObject($params); + /* @var $object kDBList */ + $value = $object->GetDBField($status_fields[0]); // sets base status icon - /* @var $object kDBItem */ + if ($value == STATUS_ACTIVE) { - if( $object->HasField('IsPop') && $object->GetDBField('IsPop') ) $value = 'POP'; - if( $object->HasField('IsHot') && $object->GetDBField('IsHot') ) $value = 'HOT'; +// if( $object->HasField('IsPop') && $object->GetDBField('IsPop') ) $value = 'POP'; +// if( $object->HasField('IsHot') && $object->GetDBField('IsHot') ) $value = 'HOT'; if( $object->HasField('IsNew') && $object->GetDBField('IsNew') ) $value = 'NEW'; - if( $object->HasField('EditorsPick') && $object->GetDBField('EditorsPick') ) $value = 'PICK'; +// if( $object->HasField('EditorsPick') && $object->GetDBField('EditorsPick') ) $value = 'PICK'; } - return isset($icons[$value]) ? $icons[$value] : $icons['default']; + return array_key_exists($value, $icons) ? $icons[$value] : $icons['default']; } /**