Commit 016d3870 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch '6107-search-does-not-work-on-template' into '1.4-dev'

Resolve "Search does not work on template"

See merge request fusiondirectory/fd!801
Showing with 2 additions and 3 deletions
+2 -3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* /*
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
Copyright (C) 2013-2018 FusionDirectory Copyright (C) 2013-2020 FusionDirectory
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
/*! /*!
* \file class_ldapFilter.inc * \file class_ldapFilter.inc
* Source code for class ldapFilter and ldapFilterLeaf * Source code for class ldapFilter and ldapFilterLeaf
...@@ -122,7 +121,7 @@ class ldapFilter ...@@ -122,7 +121,7 @@ class ldapFilter
} else { } else {
return new ldapFilter($filter[0], $subfilters); return new ldapFilter($filter[0], $subfilters);
} }
} elseif (preg_match('/^([^\\(\\)\\=\\>\\<]+)('.join('|', ldapFilterLeaf::$operators).')([^\\(\\)]+)$/', $filter, $m)) { } elseif (preg_match('/^([^\\(\\)\\=\\>\\<]+)('.join('|', ldapFilterLeaf::$operators).')([^\\(\\)]*)$/', $filter, $m)) {
return new ldapFilterLeaf($m[1], $m[2], $m[3]); return new ldapFilterLeaf($m[1], $m[2], $m[3]);
} else { } else {
throw new FusionDirectoryException('Failed to parse '.$filter); throw new FusionDirectoryException('Failed to parse '.$filter);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment