summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2010-07-20 20:30:49 (GMT)
committer Earl Miles2010-07-20 20:30:49 (GMT)
commit8292a3f5067bc85e061e3d85202bf11ccfa0b2a3 (patch)
tree317be49cf72953d13c5e4ccfdcf14d001e4c20ff
parent07c7158559b5831942b234bf733f0482d5ff4ab1 (diff)
#842976 by drewish: Make sure the theme knows path and file information for plugin supplied themes.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--panels.module7
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7dfb8f2..5e0a10a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -30,6 +30,7 @@ Moved Panels stylizer to CTools. You must update CTools at the same time as Pane
#823216 by jonathan1055: Put quotes around url() in rounded corners CSS.
#603150 by hefox: Protect against the panels node add form being used in unusual places.
#841824 by levacjeep: Extend panels_edit and panels_edit_layout to allow more options with the $destination.
+#842976 by drewish: Make sure the theme knows path and file information for plugin supplied themes.
Panels 6.x-3.5 (2010-May-28)
==============
diff --git a/panels.module b/panels.module
index a199cef..9dc659b 100644
--- a/panels.module
+++ b/panels.module
@@ -73,6 +73,7 @@ function panels_theme() {
$theme[$data[$callback]] = array(
'arguments' => array('css_id' => NULL, 'content' => NULL, 'settings' => NULL, 'display' => NULL, 'layout' => NULL, 'renderer' => NULL),
'path' => $data['path'],
+ 'file' => $data['file'],
);
// if no theme function exists, assume template.
@@ -89,6 +90,8 @@ function panels_theme() {
if (!empty($data['render pane'])) {
$theme[$data['render pane']] = array(
'arguments' => array('output' => NULL, 'pane' => NULL, 'display' => NULL, 'style' => NULL),
+ 'path' => $data['path'],
+ 'file' => $data['file'],
);
}
// If we're in legacy mode, include the old callback key for legacy styles.
@@ -96,12 +99,16 @@ function panels_theme() {
if (!empty($data['render panel'])) {
$theme[$data['render panel']] = array(
'arguments' => array('display' => NULL, 'panel_id' => NULL, 'panes' => NULL, 'settings' => NULL, 'style' => NULL),
+ 'path' => $data['path'],
+ 'file' => $data['file'],
);
}
}
if (!empty($data['render region'])) {
$theme[$data['render region']] = array(
'arguments' => array('display' => NULL, 'region_id' => NULL, 'panes' => NULL, 'settings' => NULL, 'style' => NULL),
+ 'path' => $data['path'],
+ 'file' => $data['file'],
);
}