diff options
-rwxr-xr-x | boot.php | 5 | ||||
-rw-r--r-- | version.inc | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -1804,7 +1804,10 @@ function construct_page(&$a) { require_once('include/comanche.php'); - if(($p = theme_include('mod_' . $a->module . '.pdl')) != '') + // in case a page has overloaded a module, see if we already have a layout defined + // otherwise, if a pdl file exists for this module, use it + + if((! count($a->layout)) && ($p = theme_include('mod_' . $a->module . '.pdl')) != '') comanche_parser($a,@file_get_contents($p)); $comanche = ((count($a->layout)) ? true : false); diff --git a/version.inc b/version.inc index ad4b11889..490208526 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-02-22.596 +2014-02-23.597 |