From d29b2005aa0e943a81932b6ae67d377f51dc6616 Mon Sep 17 00:00:00 2001 From: ngleader Date: Fri, 22 Jan 2010 01:20:41 +0000 Subject: [PATCH 01/14] =?UTF-8?q?document=20update=EC=8B=9C=20module=5Fsrl?= =?UTF-8?q?=20check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7219 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/document/document.controller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 43ea33b1d..890f53004 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -250,6 +250,7 @@ $oDB->begin(); $oModuleModel = &getModel('module'); + if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl'); $module_srl = $obj->module_srl; $document_config = $oModuleModel->getModulePartConfig('document', $module_srl); if(!isset($document_config->use_history)) $document_config->use_history = 'N'; From 9bf9f38de8d825977994f86f118230a27faddaea Mon Sep 17 00:00:00 2001 From: haneul Date: Fri, 22 Jan 2010 02:21:38 +0000 Subject: [PATCH 02/14] #18634201 : if navigation input does not exist, skip event git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7220 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/tpl/js/admin.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 04b40d41e..d84c26cf8 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -88,6 +88,8 @@ jQuery(function($){ var btn = $('#search_nav button:first'); var result = $('