Index: trunk/core/units/images/image_tag_processor.php
===================================================================
diff -u -r8388 -r8391
--- trunk/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8388)
+++ trunk/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8391)
@@ -64,6 +64,8 @@
$parent_item =& $this->Application->recallObject($params['PrefixSpecial']);
$object =& $this->Application->recallObject($this->getPrefixSpecial(), null, Array('skip_autoload' => true));
+ /* @var $object kDBItem */
+
$object->Clear();
// if we need primary thumbnail which is preloaded with products list
@@ -83,7 +85,8 @@
)
{
$object->SetDefaultValues();
- $object->SetDBFieldsFromHash($parent_item->GetFieldValues(), Array('SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath', 'Url') );
+ $object->SetDBField('Url', $parent_item->GetDBField('FullUrl'));
+ $object->SetDBFieldsFromHash($parent_item->GetFieldValues(), Array('SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath') );
$object->Loaded = true;
}
else { // if requested image is not primary thumbnail - load it directly
Index: trunk/themes/default2007/platform/designs/content_boxes.tpl
===================================================================
diff -u -r8388 -r8391
--- trunk/themes/default2007/platform/designs/content_boxes.tpl (.../content_boxes.tpl) (revision 8388)
+++ trunk/themes/default2007/platform/designs/content_boxes.tpl (.../content_boxes.tpl) (revision 8391)
@@ -30,6 +30,13 @@
+
+
+
+
+
+
+
" title="" alt="" border="0" />
Index: trunk/kernel/units/images/image_tag_processor.php
===================================================================
diff -u -r8388 -r8391
--- trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8388)
+++ trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8391)
@@ -64,6 +64,8 @@
$parent_item =& $this->Application->recallObject($params['PrefixSpecial']);
$object =& $this->Application->recallObject($this->getPrefixSpecial(), null, Array('skip_autoload' => true));
+ /* @var $object kDBItem */
+
$object->Clear();
// if we need primary thumbnail which is preloaded with products list
@@ -83,7 +85,8 @@
)
{
$object->SetDefaultValues();
- $object->SetDBFieldsFromHash($parent_item->GetFieldValues(), Array('SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath', 'Url') );
+ $object->SetDBField('Url', $parent_item->GetDBField('FullUrl'));
+ $object->SetDBFieldsFromHash($parent_item->GetFieldValues(), Array('SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath') );
$object->Loaded = true;
}
else { // if requested image is not primary thumbnail - load it directly
Index: trunk/core/units/general/cat_tag_processor.php
===================================================================
diff -u -r8388 -r8391
--- trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 8388)
+++ trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 8391)
@@ -66,9 +66,17 @@
function CategoryPath($params)
{
- if (!isset($params['cat_id'])) {
- $params['cat_id'] = $this->Application->RecallVar($params['session_var'], 0);
+ if ($this->Application->IsAdmin()) {
+ // path for module root category in admin
+ if (!isset($params['cat_id'])) {
+ $params['cat_id'] = $this->Application->RecallVar($params['session_var'], 0);
+ }
}
+ else {
+ // path for category item category in front-end
+ $object =& $this->getObject($params);
+ $params['cat_id'] = $object->GetDBField('CategoryId');
+ }
return $this->Application->ProcessParsedTag('c', 'CategoryPath', $params);
}