fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 1599 consider the cureent language

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10313 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-05 07:32:02 +00:00
parent 1caaa0f8c7
commit 0f710ea475
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/document/document.admin.controller.php
View file

@ -194,8 +194,6 @@
$extraVarsListByDocumentSrl[$value->document_srl] = array();
}
//$extraVarsListByDocumentSrl[$value->document_srl]['var_idx'] = $value->var_idx;
//$extraVarsListByDocumentSrl[$value->document_srl]['value'] = $value->value;
array_push($extraVarsListByDocumentSrl[$value->document_srl], $value);
}
}
@ -207,10 +205,10 @@
$obj = null;
$obj = $oDocument->getObjectVars();
$extraVars = $extraVarsListByDocumentSrl[$document_srl];
if($module_srl == $obj->module_srl)
{
//$extraVars = $oDocument->getExtraVars();
$extraVars = $extraVarsListByDocumentSrl[$document_srl];
if(is_array($extraVars))
{
foreach($extraVars as $extraItem)
@ -259,7 +257,12 @@
{
foreach($extraVars AS $key=>$value)
{
if($value->var_idx < 0)
if($value->idx >= 0 && $value->lang_code == Context::getLangType())
{
continue;
}
if( $value->var_idx < 0 || ($module_srl == $value->module_srl && $value->var_idx >= 0) )
{
$oDocumentController->insertDocumentExtraVar($value->module_srl, $obj->document_srl, $value->var_idx, $value->value, $value->eid, $value->lang_code);
}