diff --git a/views_content/plugins/content_types/views.inc b/views_content/plugins/content_types/views.inc index 3f75f2f4c3d63302965151ac96d463e45a7e2e3b..606ee69eb6460d6876862c5cfeab3fd654e4653a 100644 --- a/views_content/plugins/content_types/views.inc +++ b/views_content/plugins/content_types/views.inc @@ -188,7 +188,12 @@ function views_content_views_content_type_render($subtype, $conf, $panel_args, $ $block->more = array('href' => $view->get_url()); $view->display_handler->set_option('use_more', FALSE); } - $view->display_handler->set_option('use_pager', $conf['use_pager']); + + // Only set use_pager if they differ, this way we can avoid overwriting the + // pager type that Views uses. + if (!$view->display_handler->set_option('use_pager') || empty($conf['use_pager')) { + $view->display_handler->set_option('use_pager', $conf['use_pager']); + } $view->display_handler->set_option('pager_element', $conf['pager_id']); $view->display_handler->set_option('items_per_page', $conf['nodes_per_page']); $view->display_handler->set_option('offset', $conf['offset']); diff --git a/views_content/plugins/content_types/views_panes.inc b/views_content/plugins/content_types/views_panes.inc index a87f36b3e101fd4a8a8b88a67d98631a2a47d46c..a196cf846c8388f763879cc0be0432b50e214b9a 100644 --- a/views_content/plugins/content_types/views_panes.inc +++ b/views_content/plugins/content_types/views_panes.inc @@ -216,7 +216,11 @@ function views_content_views_panes_content_type_render($subtype, $conf, $panel_a } if ($allow['use_pager']) { - $view->display_handler->set_option('use_pager', $conf['use_pager']); + // Only set use_pager if they differ, this way we can avoid overwriting the + // pager type that Views uses. + if (!$view->display_handler->set_option('use_pager') || empty($conf['use_pager')) { + $view->display_handler->set_option('use_pager', $conf['use_pager']); + } $view->display_handler->set_option('pager_element', $conf['pager_id']); } if ($allow['items_per_page'] && isset($conf['items_per_page'])) {