summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/display_renderers/panels_renderer_standard.class.php2
-rw-r--r--plugins/export_ui/panels_layouts_ui.class.php1
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/display_renderers/panels_renderer_standard.class.php b/plugins/display_renderers/panels_renderer_standard.class.php
index a6cf0d7..ec3c778 100644
--- a/plugins/display_renderers/panels_renderer_standard.class.php
+++ b/plugins/display_renderers/panels_renderer_standard.class.php
@@ -536,7 +536,7 @@ class panels_renderer_standard {
$content = $cache->content;
}
else {
- $content = ctools_content_render($pane->type, $pane->subtype, $pane->configuration, array(), $this->display->args, $this->display->context);
+ $content = (object) ctools_content_render($pane->type, $pane->subtype, $pane->configuration, array(), $this->display->args, $this->display->context);
foreach (module_implements('panels_pane_content_alter') as $module) {
$function = $module . '_panels_pane_content_alter';
$function($content, $pane, $this->display->args, $this->display->context);
diff --git a/plugins/export_ui/panels_layouts_ui.class.php b/plugins/export_ui/panels_layouts_ui.class.php
index a2b2850..0f47f09 100644
--- a/plugins/export_ui/panels_layouts_ui.class.php
+++ b/plugins/export_ui/panels_layouts_ui.class.php
@@ -64,7 +64,6 @@ class panels_layouts_ui extends ctools_export_ui {
else {
$content_types = ctools_content_get_available_types();
- $display->cache_key = $cache_key;
panels_cache_clear('display', $cache_key);
$cache = new stdClass();