|
@@ -2133,15 +2133,14 @@ function number_pad($number,$n) {
|
|
|
|
|
|
//validate and format limit and offset clause of select statement
|
|
//validate and format limit and offset clause of select statement
|
|
if (!function_exists('limit_offset')) {
|
|
if (!function_exists('limit_offset')) {
|
|
- function limit_offset($limit, $offset) {
|
|
|
|
|
|
+ function limit_offset($limit, $offset = 0) {
|
|
$regex = '#[^0-9]#';
|
|
$regex = '#[^0-9]#';
|
|
$limit = preg_replace($regex, '', $limit);
|
|
$limit = preg_replace($regex, '', $limit);
|
|
$offset = preg_replace($regex, '', $offset);
|
|
$offset = preg_replace($regex, '', $offset);
|
|
if (is_numeric($limit) && $limit > 0) {
|
|
if (is_numeric($limit) && $limit > 0) {
|
|
$clause .= ' limit '.$limit;
|
|
$clause .= ' limit '.$limit;
|
|
- if (is_numeric($offset)) {
|
|
|
|
- $clause .= ' offset '.$offset;
|
|
|
|
- }
|
|
|
|
|
|
+ $offset = is_numeric($offset) ? $offset : 0;
|
|
|
|
+ $clause .= ' offset '.$offset;
|
|
}
|
|
}
|
|
return $clause.' ';
|
|
return $clause.' ';
|
|
}
|
|
}
|