Browse Source

Revert "Fix search by date in session catalog - refs BT#13756"

This reverts commit a02b45084bf680526152b084cf01b303627314c3.
Angel Fernando Quiroz Campos 7 years ago
parent
commit
ca80b94040
1 changed files with 2 additions and 5 deletions
  1. 2 5
      main/inc/lib/auth.lib.php

+ 2 - 5
main/inc/lib/auth.lib.php

@@ -697,15 +697,12 @@ class Auth
             $query
                 ->andWhere(
                     $qb->expr()->orX(
-                        $qb->expr()->andX(
-                            $qb->expr()->gte('s.accessStartDate', ':date'),
-                            $qb->expr()->gte('s.accessEndDate', ':date')
-                        ),
+                        $qb->expr()->between(':date', 's.accessStartDate', 's.accessEndDate'),
                         $qb->expr()->isNull('s.accessEndDate'),
                         $qb->expr()->andX(
                             $qb->expr()->isNull('s.accessStartDate'),
                             $qb->expr()->isNotNull('s.accessEndDate'),
-                            $qb->expr()->gte('s.accessEndDate', ':date')
+                            $qb->expr()->gt('s.accessEndDate', ':date')
                         )
                     )
                 )