瀏覽代碼

Fix filter on member without subscription

Laurent Destailleur 2 年之前
父節點
當前提交
63a62edcf6
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      htdocs/adherents/list.php
  2. 1 1
      htdocs/partnership/partnership_list.php

+ 1 - 1
htdocs/adherents/list.php

@@ -365,7 +365,7 @@ if ($search_type > 0) {
 	$sql .= " AND t.rowid=".((int) $search_type);
 }
 if ($search_filter == 'withoutsubscription') {
-	$sql .= " AND (datefin IS NULL OR t.subscription = '0')";
+	$sql .= " AND (datefin IS NULL)";
 }
 if ($search_filter == 'uptodate') {
 	$sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = '0')";

+ 1 - 1
htdocs/partnership/partnership_list.php

@@ -359,7 +359,7 @@ foreach ($search as $key => $val) {
 }
 if ($managedfor == 'member') {
 	if ($search_filter == 'withoutsubscription') {
-		$sql .= " AND (d.datefin IS NULL OR dty.subscription = 0)";
+		$sql .= " AND (d.datefin IS NULL)";
 	}
 	if ($search_filter == 'uptodate') {
 		$sql .= " AND (d.datefin >= '".$db->idate($now)."' OR dty.subscription = 0)";