summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2010-07-20 19:01:14 (GMT)
committer Earl Miles2010-07-20 19:01:14 (GMT)
commita76576fedb24873a303c40e9d3034494a4cf0330 (patch)
treec77dc1d69b03471ab5047b4a117a9b44265ee569
parent45b1c8bcbd6f2835b7069a6a3e23ace8526f9031 (diff)
#675220 by dereine: Provide a watchdog message if a layout can't be loaded when rendering a panel.
-rw-r--r--CHANGELOG.txt3
-rw-r--r--plugins/display_renderers/panels_renderer_legacy.class.php6
-rw-r--r--plugins/display_renderers/panels_renderer_standard.class.php4
3 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bd82a1c..a0a5a17 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -24,7 +24,8 @@ Moved Panels stylizer to CTools. You must update CTools at the same time as Pane
#737602: Generic NOT checkbox for all access tests.
#369628: Sort results by export key when bulk exporting.
#690902: Improvement to export.module integration of panel nodes.
-#690814: Panels mini edit form could overwrite page title.
+#690814 by neclimdul: Panels mini edit form could overwrite page title.
+#675220 by dereine: Provide a watchdog message if a layout can't be loaded when rendering a panel.
Panels 6.x-3.5 (2010-May-28)
==============
diff --git a/plugins/display_renderers/panels_renderer_legacy.class.php b/plugins/display_renderers/panels_renderer_legacy.class.php
index 2b65ef4..0f6071f 100644
--- a/plugins/display_renderers/panels_renderer_legacy.class.php
+++ b/plugins/display_renderers/panels_renderer_legacy.class.php
@@ -24,9 +24,11 @@ class panels_renderer_legacy {
function init($plugin, &$display) {
$this->plugin = $plugin;
- $layout = panels_get_layout($display->layout);
+ $this->plugins['layout'] = panels_get_layout($display->layout);
+ if (empty($this->plugins['layout'])) {
+ watchdog('panels', "Layout: @layout couldn't been found, maybe the theme is disabled.", array('@layout' => $display->layout));
+ }
$this->display = &$display;
- $this->plugins['layout'] = $layout;
}
/**
diff --git a/plugins/display_renderers/panels_renderer_standard.class.php b/plugins/display_renderers/panels_renderer_standard.class.php
index fb3fe1c..c4c5ec7 100644
--- a/plugins/display_renderers/panels_renderer_standard.class.php
+++ b/plugins/display_renderers/panels_renderer_standard.class.php
@@ -137,6 +137,10 @@ class panels_renderer_standard {
if (!isset($layout['panels'])) {
$this->plugins['layout']['panels'] = panels_get_regions($layout, $display);
}
+
+ if (empty($this->plugins['layout'])) {
+ watchdog('panels', "Layout: @layout couldn't been found, maybe the theme is disabled.", array('@layout' => $display->layout));
+ }
}
/**