Merge pull request #9988 from frederic34/patch-15

The variable $i seems to be never defined.
This commit is contained in:
Laurent Destailleur 2018-11-10 12:20:09 +01:00 committed by GitHub
commit 776d5e6fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -129,11 +129,12 @@ class Products extends DolibarrApi
$sql.= " AND c.fk_categorie = ".$db->escape($category); $sql.= " AND c.fk_categorie = ".$db->escape($category);
$sql.= " AND c.fk_product = t.rowid "; $sql.= " AND c.fk_product = t.rowid ";
} }
// Show products if ($mode == 1) {
if ($mode == 1) { $sql.= " AND t.fk_product_type = 0"; // Show only products
} $sql.= " AND t.fk_product_type = 0";
// Show services } elseif ($mode == 2) {
if ($mode == 2) { $sql.= " AND t.fk_product_type = 1"; // Show only services
$sql.= " AND t.fk_product_type = 1";
} }
// Add sql filters // Add sql filters
if ($sqlfilters) { if ($sqlfilters) {
@ -158,6 +159,7 @@ class Products extends DolibarrApi
if ($result) { if ($result) {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit)); $min = min($num, ($limit <= 0 ? $num : $limit));
$i = 0;
while ($i < $min) while ($i < $min)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);