Index: trunk/kernel/units/configuration/configuration_tag_processor.php =================================================================== diff -u -N -r4808 -r5214 --- trunk/kernel/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 4808) +++ trunk/kernel/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 5214) @@ -159,8 +159,12 @@ return $this->Application->ParseBlock($block_params); } else { - $cat_object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $sql = 'SELECT CategoryId, ParentId, Name FROM '.TABLE_PREFIX.'Category WHERE CategoryId='.$params['cat_id']; + $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); + + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $sql = 'SELECT CategoryId, ParentId, '.$ml_formatter->LangFieldName('Name').' AS Name + FROM '.TABLE_PREFIX.'Category + WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); if ($res === false) { // in case if category is deleted Index: trunk/core/units/configuration/configuration_tag_processor.php =================================================================== diff -u -N -r4808 -r5214 --- trunk/core/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 4808) +++ trunk/core/units/configuration/configuration_tag_processor.php (.../configuration_tag_processor.php) (revision 5214) @@ -159,8 +159,12 @@ return $this->Application->ParseBlock($block_params); } else { - $cat_object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $sql = 'SELECT CategoryId, ParentId, Name FROM '.TABLE_PREFIX.'Category WHERE CategoryId='.$params['cat_id']; + $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); + + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $sql = 'SELECT CategoryId, ParentId, '.$ml_formatter->LangFieldName('Name').' AS Name + FROM '.TABLE_PREFIX.'Category + WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); if ($res === false) { // in case if category is deleted Index: trunk/kernel/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5212 -r5214 --- trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5212) +++ trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5214) @@ -137,10 +137,8 @@ else { $block_params['name'] = $this->SelectParam($params,'render_as,block'); - - $title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField'); // $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $sql = 'SELECT CategoryId, ParentId, '.$title_field.' AS Name + $sql = 'SELECT CategoryId, ParentId, '.$this->getTitleField().' AS Name FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').' WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); @@ -176,12 +174,18 @@ function CurrentCategoryName($params) { $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); - $sql = 'SELECT '.$this->Application->getUnitOption($this->Prefix, 'TitleField').' + $sql = 'SELECT '.$this->getTitleField().' FROM '.$cat_object->TableName.' WHERE CategoryId = '.$this->Application->GetVar('m_cat_id'); return $this->Conn->GetOne($sql); } + function getTitleField() + { + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + return $ml_formatter->LangFieldName('Name'); + } + function CategoryLink($params) { // 'p_id'=>'0', ?? Index: trunk/kernel/units/general/cat_tag_processor.php =================================================================== diff -u -N -r5095 -r5214 --- trunk/kernel/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5095) +++ trunk/kernel/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5214) @@ -45,22 +45,22 @@ function CategoryPath($params) { - if (!isset($params['cat_id'])) - { + if (!isset($params['cat_id'])) { $params['cat_id'] = $this->Application->RecallVar($params['session_var'], 0); } $block_params['separator'] = $params['separator']; - if($params['cat_id'] == 0) - { + if ($params['cat_id'] == 0) { $block_params['name'] = $params['rootcatblock']; return $this->Application->ParseBlock($block_params); } - else - { + else { $cat_object =& $this->Application->recallObject('c', 'c_List'); - $sql = 'SELECT CategoryId, ParentId, Name FROM '.$cat_object->TableName.' WHERE CategoryId = '.$params['cat_id']; + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $sql = 'SELECT CategoryId, ParentId, '.$ml_formatter->LangFieldName('Name').' AS Name + FROM '.$cat_object->TableName.' + WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); if ($res === false) { // in case if category is deleted Index: trunk/core/units/general/cat_tag_processor.php =================================================================== diff -u -N -r5095 -r5214 --- trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5095) +++ trunk/core/units/general/cat_tag_processor.php (.../cat_tag_processor.php) (revision 5214) @@ -45,22 +45,22 @@ function CategoryPath($params) { - if (!isset($params['cat_id'])) - { + if (!isset($params['cat_id'])) { $params['cat_id'] = $this->Application->RecallVar($params['session_var'], 0); } $block_params['separator'] = $params['separator']; - if($params['cat_id'] == 0) - { + if ($params['cat_id'] == 0) { $block_params['name'] = $params['rootcatblock']; return $this->Application->ParseBlock($block_params); } - else - { + else { $cat_object =& $this->Application->recallObject('c', 'c_List'); - $sql = 'SELECT CategoryId, ParentId, Name FROM '.$cat_object->TableName.' WHERE CategoryId = '.$params['cat_id']; + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $sql = 'SELECT CategoryId, ParentId, '.$ml_formatter->LangFieldName('Name').' AS Name + FROM '.$cat_object->TableName.' + WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); if ($res === false) { // in case if category is deleted Index: trunk/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5212 -r5214 --- trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5212) +++ trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5214) @@ -137,10 +137,8 @@ else { $block_params['name'] = $this->SelectParam($params,'render_as,block'); - - $title_field = $this->Application->getUnitOption($this->Prefix, 'TitleField'); // $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $sql = 'SELECT CategoryId, ParentId, '.$title_field.' AS Name + $sql = 'SELECT CategoryId, ParentId, '.$this->getTitleField().' AS Name FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').' WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); @@ -176,12 +174,18 @@ function CurrentCategoryName($params) { $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); - $sql = 'SELECT '.$this->Application->getUnitOption($this->Prefix, 'TitleField').' + $sql = 'SELECT '.$this->getTitleField().' FROM '.$cat_object->TableName.' WHERE CategoryId = '.$this->Application->GetVar('m_cat_id'); return $this->Conn->GetOne($sql); } + function getTitleField() + { + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + return $ml_formatter->LangFieldName('Name'); + } + function CategoryLink($params) { // 'p_id'=>'0', ??