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

merge sandbox to trunk for 1.4.4.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/document/document.item.php
View file

@ -428,10 +428,14 @@
function getExtraEidValue($eid) {
$extra_vars = $this->getExtraVars();
// eid 명칭으로 확장변수 처리
foreach($extra_vars as $idx => $key) {
$extra_eid[$key->eid] = $key;
}
if($extra_vars)
{
// eid 명칭으로 확장변수 처리
foreach($extra_vars as $idx => $key) {
$extra_eid[$key->eid] = $key;
}
}
return $extra_eid[$eid]->value;
}

2
modules/document/document.model.php
View file

@ -96,7 +96,7 @@
if(!$document_srl) return new documentItem();
if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl])) {
$oDocument = new documentItem($document_srl, true);
$oDocument = new documentItem($document_srl, $load_extra_vars);
$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
if($load_extra_vars) $this->setToAllDocumentExtraVars();
}

4
modules/document/lang/jp.lang.php
View file

@ -95,6 +95,6 @@
'trash_ipaddress' => '削除者のIPアドレス',
);
$lang->success_trashed = "Successfully moved to trashcan";
$lang->msg_not_selected_document = '선택된 문서가 없습니다.';
$lang->success_trashed = "ごみ箱に移動させました。";
$lang->msg_not_selected_document = '選択された書き込みがありません。';
?>

2
modules/document/queries/insertDocument.xml
View file

@ -25,7 +25,7 @@
<column name="user_id" var="user_id" default="" />
<column name="user_name" var="user_name" default="" />
<column name="email_address" var="email_address" filter="email" maxlength="250" />
<column name="homepage" var="homepage" filter="homepage" maxlength="250" />
<column name="homepage" var="homepage" filter="homepage" default="" maxlength="250" />
<column name="tags" var="tags" />
<column name="extra_vars" var="extra_vars" />
<column name="regdate" var="regdate" default="curdate()" />