From c1427b373e015ceff216923d99ae8d87efcafb28 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 24 Feb 2017 10:23:04 +0800 Subject: [PATCH] * ignore empty order. --- lib/base/dao/dao.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php index f1a0959012..62c5131559 100644 --- a/lib/base/dao/dao.class.php +++ b/lib/base/dao/dao.class.php @@ -1924,7 +1924,8 @@ class baseSQL $orders = $pos ? substr($order, 0, $pos) : $order; $limit = $pos ? substr($order, $pos) : ''; $orders = trim($orders); - if(!preg_match('/^(\w+\.)?(`\w+`|\w+)( +(desc|asc))?( *(, *(\w+\.)?(`\w+`|\w+)( +(desc|asc))?)?)*$/i', $orders))die("Order is bad request, The order is $orders"); + if(empty($orders)) return $this; + if(!preg_match('/^(\w+\.)?(`\w+`|\w+)( +(desc|asc))?( *(, *(\w+\.)?(`\w+`|\w+)( +(desc|asc))?)?)*$/i', $orders)) die("Order is bad request, The order is $orders"); $orders = explode(',', $orders); foreach($orders as $i => $order)