merge with 1.4.5.7

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8356 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-05-06 02:42:14 +00:00
parent 25d2f6af1e
commit b5d2e05282
12 changed files with 48 additions and 32 deletions

View file

@ -547,6 +547,8 @@
} elseif(!$value){
$value = '';
}
// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
else $this->_filterNumber(&$value);
$column_list[] = '['.$name.']';
$value_list[] = '?';
@ -591,10 +593,9 @@
$column_list[] = sprintf("[%s] = ?", $name);
}else{
if(!$value) $value = '';
$this->_filterNumber(&$value);
$column_list[] = sprintf("[%s] = %s", $name, $value);
}
}
}
// List the conditional clause