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

Merge pull request #17 from xpressengine/develop

Browse source 
Version up to 1.8.7
This commit is contained in:
YJSoft 2015-07-19 08:22:33 +09:00
commit 38e7dae913
3 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Gruntfile.js
View file

@ -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!');
});
});
});
}

2
config/config.inc.php
View file

@ -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));

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

@ -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_eid) && array_key_exists($eid,$extra_eid))
{
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_eid) && array_key_exists($eid,$extra_eid))
{
return $extra_eid[$eid]->getValueHTML();
}
else
{
return '';
}
}
function getExtraVarsValue($key)