Merge branch 'release/1.7.8' into develop

This commit is contained in:
bnu 2014-11-24 16:30:02 +09:00
commit d4e10dd338
16 changed files with 75 additions and 60 deletions

View file

@ -88,7 +88,7 @@ class ConditionTag
{
if(isset($condition->attrs->default))
{
$operationList = array('in' => 1, 'between' => 1, 'not in' => 1);
$operationList = array('in' => 1, 'between' => 1, 'notin' => 1, 'not_in' => 1);
if(isset($operationList[$this->operation]))
{
$default_value = $condition->attrs->default;