Projet

Général

Profil

Révision 4003efde

Ajouté par Assos Assos il y a environ 4 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/views/plugins/views_plugin_display.inc
314 314
        }
315 315
      }
316 316
      $pager = $this->get_plugin('pager');
317
      if (isset($pager) && $pager->uses_exposed()) {
317
      if ($pager && $pager->uses_exposed()) {
318 318
        $this->has_exposed = TRUE;
319 319
        return TRUE;
320 320
      }
......
1400 1400
      '***DEFAULT_LANGUAGE***' => t("Default site language"),
1401 1401
      LANGUAGE_NONE => t('Language neutral'),
1402 1402
    );
1403
    if (module_exists('locale')) {
1404
      $languages = array_merge($languages, locale_language_list());
1405
    }
1403
    $languages = array_merge($languages, views_language_list());
1404

  
1406 1405
    $field_language = array();
1407 1406
    $options['field_language'] = array(
1408 1407
      'category' => 'other',

Formats disponibles : Unified diff