diff --git a/includes/context.inc b/includes/context.inc index 55d7651dec3d6b9c30327b4e9a8267570ed12dd0..c8492b7123e69db9c1ea6c6dc3036c4a8d81e4cb 100644 --- a/includes/context.inc +++ b/includes/context.inc @@ -160,7 +160,7 @@ class ctools_context_required { // Due to a bug, some contexts got recorded with an id of 0. This will // convert them to the correct ID allowing for some earlier panels // to continue to work. - if (!empty($context) && $context[strlen($context) - 1] === '0') {\ + if (!empty($context) && $context[strlen($context) - 1] === '0') { $context[strlen($context) - 1] = 1; } diff --git a/views_content/plugins/content_types/views.inc b/views_content/plugins/content_types/views.inc index 4ce68ee0eec0bf728069c21b05e893c50d85bf67..6da2c32865ab2d24fe34c6ec6f86f2fe1656f75e 100644 --- a/views_content/plugins/content_types/views.inc +++ b/views_content/plugins/content_types/views.inc @@ -59,7 +59,9 @@ function views_content_views_content_type_content_types($plugin) { $views = views_get_all_views(); foreach ($views as $view) { - $types[$view->name] = _views_content_views_content_type($view); + if (!empty($view->disabled)) { + $types[$view->name] = _views_content_views_content_type($view); + } } views_cache_set('views_content_all', $types, TRUE); diff --git a/views_content/plugins/content_types/views_panes.inc b/views_content/plugins/content_types/views_panes.inc index 29e72693a1dd84a6655a100a76630ece6a2f323c..0700fab38d69e51ab659aa4f2682915e6954530f 100644 --- a/views_content/plugins/content_types/views_panes.inc +++ b/views_content/plugins/content_types/views_panes.inc @@ -40,6 +40,10 @@ function views_content_views_panes_content_type_content_types($plugin) { $views = views_get_all_views(); foreach ($views as $view) { + if (!empty($view->disabled)) { + continue; + } + $view->init_display(); foreach ($view->display as $id => $display) {