From b95ff6a5f8bb37992cc7c0f98f75c6fb97f3e37b Mon Sep 17 00:00:00 2001 From: YJSoft Date: Mon, 13 Jul 2015 21:40:22 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=97=86=EB=8A=94=20=ED=99=95=EC=9E=A5?= =?UTF-8?q?=EB=B3=80=EC=88=98=EC=97=90=20=EC=A0=91=EA=B7=BC=EC=8B=9C=20?= =?UTF-8?q?=EB=B0=9C=EC=83=9D=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/document.item.php | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 8c240b9ee..98b5a68cf 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -651,7 +651,14 @@ class documentItem extends Object function getExtraValue($idx) { $extra_vars = $this->getExtraVars(); - return $extra_vars[$idx]->getValue(); + if(is_array($extra_vars) && array_key_exists($idx,$extra_vars)) + { + return $extra_vars[$idx]->getValue(); + } + else + { + return ''; + } } function getExtraValueHTML($idx) @@ -679,7 +686,15 @@ class documentItem extends Object $extra_eid[$key->eid] = $key; } } - return $extra_eid[$eid]->getValue(); + + if(is_array($extra_vars) && array_key_exists($eid,$extra_vars)) + { + return $extra_eid[$eid]->getValue(); + } + else + { + return ''; + } } function getExtraEidValueHTML($eid) @@ -690,7 +705,15 @@ class documentItem extends Object { $extra_eid[$key->eid] = $key; } - return $extra_eid[$eid]->getValueHTML(); + + if(is_array($extra_vars) && array_key_exists($eid,$extra_vars)) + { + return $extra_eid[$eid]->getValueHTML(); + } + else + { + return ''; + } } function getExtraVarsValue($key) From a22aa3040b8a752c5f211ae844e872c77ea02778 Mon Sep 17 00:00:00 2001 From: YJSoft Date: Tue, 14 Jul 2015 09:52:28 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=B9=84=EA=B5=90=EB=AC=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/document/document.item.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 98b5a68cf..ec5dc2d2a 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -687,7 +687,7 @@ class documentItem extends Object } } - if(is_array($extra_vars) && array_key_exists($eid,$extra_vars)) + if(is_array($extra_eid) && array_key_exists($eid,$extra_eid)) { return $extra_eid[$eid]->getValue(); } @@ -706,7 +706,7 @@ class documentItem extends Object $extra_eid[$key->eid] = $key; } - if(is_array($extra_vars) && array_key_exists($eid,$extra_vars)) + if(is_array($extra_eid) && array_key_exists($eid,$extra_eid)) { return $extra_eid[$eid]->getValueHTML(); } From e08824a272f37afe60e506510916a6545a2dd735 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 17 Jul 2015 15:21:07 +0900 Subject: [PATCH 3/4] version 1.8.7 --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.inc.php b/config/config.inc.php index 3374bc830..95c9a96e7 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -29,7 +29,7 @@ define('__ZBXE__', __XE__); /** * Display XE's full version. */ -define('__XE_VERSION__', '1.8.6'); +define('__XE_VERSION__', '1.8.7'); define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false)); define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false)); define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false)); From 125de382d898c0e3c4dd38464f934d51eb702499 Mon Sep 17 00:00:00 2001 From: bnu Date: Fri, 17 Jul 2015 17:34:17 +0900 Subject: [PATCH 4/4] grunt build --- Gruntfile.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8c46bc8ee..326bbc019 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -299,7 +299,17 @@ module.exports = function(grunt) { grunt.file.delete('build/xe'); grunt.file.delete('build/temp.full.tar'); - grunt.log.ok('Done!'); + grunt.util.spawn({ + cmd: "git", + args: ['diff', '--name-status', target] + }, function (error, result, code) { + var fs = require('fs'); + result = 'Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R).' + grunt.util.linefeed + result; + grunt.file.write(build_dir + '/CHANGED.' + version + '.txt', result); + + grunt.log.ok('Done!'); + }); + }); }); }