#422504: Prevent views panes from ovewriting the view pager type (mini or full)

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']);

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'])) {