lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6888 from hregis/develop_bug2

Browse Source 
Fix: wrong min value
This commit is contained in:
Laurent Destailleur 2017-05-29 10:18:59 +02:00 committed by GitHub
commit f265e7d86a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/adherents/class/api_members.class.php
View File

@ -106,7 +106,7 @@ class Members extends DolibarrApi
$sql.= ' AND t.fk_adherent_type='.$typeid; $sql.= ' AND t.fk_adherent_type='.$typeid;
} }
// Add sql filters // Add sql filters
if ($sqlfilters) if ($sqlfilters)
{ {
if (! DolibarrApi::_checkFilters($sqlfilters)) if (! DolibarrApi::_checkFilters($sqlfilters))
{ {
@ -115,7 +115,7 @@ class Members extends DolibarrApi
$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")"; $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
} }
$sql.= $db->order($sortfield, $sortorder); $sql.= $db->order($sortfield, $sortorder);
if ($limit) { if ($limit) {
if ($page < 0) if ($page < 0)
@ -132,9 +132,10 @@ class Members extends DolibarrApi
{ {
$i=0; $i=0;
$num = $db->num_rows($result); $num = $db->num_rows($result);
while ($i < min($limit, $num)) $min = min($num, ($limit <= 0 ? $num : $limit));
while ($i < $min)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$member = new Adherent($this->db); $member = new Adherent($this->db);
if($member->fetch($obj->rowid)) { if($member->fetch($obj->rowid)) {
$obj_ret[] = $this->_cleanObjectDatas($member); $obj_ret[] = $this->_cleanObjectDatas($member);