Projet

Général

Profil

Révision bc175c27

Ajouté par Assos Assos il y a plus de 5 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_views/plugins/ldap_views_plugin_query_ldap.inc
4 4
 * @file
5 5
 * Defines the default query object which builds and execute a ldap query
6 6
 */
7

  
7 8
class ldap_views_plugin_query_ldap extends views_plugin_query {
8 9

  
9 10
  /**
......
168 169
  function build_ldap_filter($filter) {
169 170
    $condition     = $this->build_condition();
170 171
    $contextual    = $this->build_contextual_filter();
171
    $search_filter = !empty($contextual) && !empty($condition)? '(&' . $condition . $contextual . ')' : $condition . $contextual;
172
    $search_filter = !empty($contextual) && !empty($condition) ? '(&' . $condition . $contextual . ')' : $condition . $contextual;
172 173
    return !empty($search_filter) ? $search_filter : $filter;
173 174
  }
174 175

  
......
245 246
    if (property_exists($view->query, 'limit')) {
246 247
      $limit     = $view->query->limit;
247 248
    }
248
    $offset = property_exists($view->query, 'offset')? $view->query->offset : 0;
249
    $offset = property_exists($view->query, 'offset') ? $view->query->offset : 0;
249 250
    $result      = array();
250 251
    $sort_fields = array();
251 252
    if (!empty($this->orderby)) {

Formats disponibles : Unified diff