Révision 91af538d
Ajouté par Assos Assos il y a environ 3 ans
| drupal7/sites/all/modules/ldap/ldap_views/plugins/ldap_views_plugin_query_ldap.inc | ||
|---|---|---|
| 196 | 196 |
$condition = $this->build_condition(); |
| 197 | 197 |
$contextual = $this->build_contextual_filter(); |
| 198 | 198 |
$search_filter = !empty($contextual) && !empty($condition) ? '(&' . $condition . $contextual . ')' : $condition . $contextual; |
| 199 |
return !empty($search_filter) ? $search_filter : $filter; |
|
| 199 |
//if both ldap views filters & ldap views query filter exist, combine them |
|
| 200 |
//if the ldap views filter exist, use that |
|
| 201 |
//else, use ldap query filter |
|
| 202 |
if (!empty($search_filter) && !empty($filter)) {
|
|
| 203 |
return '(&' . $search_filter . $filter . ')'; |
|
| 204 |
} elseif (!empty($search_filter)) {
|
|
| 205 |
return $search_filter; |
|
| 206 |
} else {
|
|
| 207 |
return $filter; |
|
| 208 |
} |
|
| 200 | 209 |
} |
| 201 | 210 |
|
| 202 | 211 |
/** |
Formats disponibles : Unified diff
Weekly update of contrib modules