Project

General

Profile

Revision 219d19c4

Added by Assos Assos over 3 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/ctools/views_content/plugins/content_types/views_panes.inc
254 254
    if ($conf['use_pager'] && ($pager['type'] == 'none' || $pager['type'] == 'some')) {
255 255
      $pager['type'] = 'full';
256 256
    }
257
    elseif (!$conf['use_pager'] && $pager['type'] != 'none' && $pager['type'] != 'some') {
257
    elseif (!$conf['use_pager']) {
258 258
      $pager['type'] = $view->get_items_per_page() || !empty($pager['options']['items_per_page']) ? 'some' : 'none';
259 259
    }
260 260

  

Also available in: Unified diff