Commit f87bfc52 authored by dsnopek's avatar dsnopek Committed by dsnopek

Issue #2902657 by dsnopek: [views] Add D6 patch for SA-CONTRIB-2017-068

parent 651f0021
diff --git a/includes/ajax.inc b/includes/ajax.inc
index 9915863..ba948a7 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -35,7 +35,7 @@ function views_ajax() {
}
// Load the view.
if ($view = views_get_view($name)) {
- if ($view->access($display_id)) {
+ if ($view->access($display_id) && $view->set_display($display_id) && $view->display_handler->use_ajax()) {
// Fix 'q' for paging.
if (!empty($path)) {
diff --git a/includes/ajax.inc b/includes/ajax.inc
index 63ab918..8a65693 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -47,7 +47,7 @@ function views_ajax() {
// Load the view.
if ($view = views_get_view($name)) {
$view->ajax_path = array($_GET['q'], $ajax_arguments);
- if ($view->access($display_id)) {
+ if ($view->access($display_id) && $view->set_display($display_id) && $view->display_handler->use_ajax()) {
// Fix 'q' for paging.
if (!empty($path)) {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment