Index: trunk/admin/install/langpacks/english.lang =================================================================== diff -u -N -r5141 -r5210 --- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 5141) +++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 5210) @@ -455,6 +455,7 @@ TW9kdWxlIG5vdCBsaWNlbnNlZA== TW9uZGF5 TmV2ZXIgRXhwaXJlcw== + TmV3 TnVtYmVyIG9mIGRheXMgdG8gYXJjaGl2ZSBhcnRpY2xlcyBhdXRvbWF0aWNhbGx5 RGlzcGxheSBlZGl0b3IgUElDS3MgYWJvdmUgcmVndWxhciBhcnRpY2xlcw== TnVtYmVyIG9mIGRheXMgZm9yIGEgYXJ0aWNsZSB0byBiZSBORVc= @@ -520,6 +521,8 @@ QWRtaW4= Qm90aA== RnJvbnQ= + RWRpdG9yJ3MgcGljaw== + UG9w UG9zaXRpb24gQW5kIFZpc2liaWxpdHk= TmV3IHBvc3RzIChkYXlzKQ== TnVtYmVyIG9mIHBvc3RzIHBlciBwYWdl @@ -1542,7 +1545,6 @@ QmlydGggRGF0ZQ== QmxhbmsgcGFzc3dvcmQ= Ym94 - TmV3IEFydGljbGU= TmV3IExpbms= TmV3IHRvcGlj U2VuZCBQYXNzd29yZA== Index: trunk/kernel/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5165 -r5210 --- trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5165) +++ trunk/kernel/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5210) @@ -137,10 +137,12 @@ else { $block_params['name'] = $this->SelectParam($params,'render_as,block'); - + + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); // $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']; + $sql = 'SELECT CategoryId, ParentId, '.$ml_formatter->LangFieldName('Name').' AS Name + FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').' + WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); if ($res === false) { // in case if category is deleted @@ -171,13 +173,14 @@ } } - function CurrentCategoryName($params){ - - $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $cat_id = $this->Application->GetVar("m_cat_id"); - $sql = 'SELECT Name FROM '.$cat_object->TableName.' WHERE CategoryId='.$cat_id; - return $this->Conn->GetOne($sql); - + function CurrentCategoryName($params) + { + $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $sql = 'SELECT '.$ml_formatter->LangFieldName('Name').' + FROM '.$cat_object->TableName.' + WHERE CategoryId = '.$this->Application->GetVar('m_cat_id'); + return $this->Conn->GetOne($sql); } function CategoryLink($params) Index: trunk/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r5165 -r5210 --- trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5165) +++ trunk/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 5210) @@ -137,10 +137,12 @@ else { $block_params['name'] = $this->SelectParam($params,'render_as,block'); - + + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); // $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']; + $sql = 'SELECT CategoryId, ParentId, '.$ml_formatter->LangFieldName('Name').' AS Name + FROM '.$this->Application->getUnitOption($this->Prefix, 'TableName').' + WHERE CategoryId = '.$params['cat_id']; $res = $this->Conn->GetRow($sql); if ($res === false) { // in case if category is deleted @@ -171,13 +173,14 @@ } } - function CurrentCategoryName($params){ - - $cat_object = &$this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix.'_List' ); - $cat_id = $this->Application->GetVar("m_cat_id"); - $sql = 'SELECT Name FROM '.$cat_object->TableName.' WHERE CategoryId='.$cat_id; - return $this->Conn->GetOne($sql); - + function CurrentCategoryName($params) + { + $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List'); + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $sql = 'SELECT '.$ml_formatter->LangFieldName('Name').' + FROM '.$cat_object->TableName.' + WHERE CategoryId = '.$this->Application->GetVar('m_cat_id'); + return $this->Conn->GetOne($sql); } function CategoryLink($params)