diff options
| author | friendica <info@friendica.com> | 2014-02-23 18:40:43 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-23 18:40:43 -0800 |
| commit | 2ccff45221905981c6942f1f3064d477113e959e (patch) | |
| tree | e602da706bcbdfcf2d65be8d3f5226a901422dc3 | |
| parent | b78d423a54cdb1a1683c3aca973ad8c82c4d7caa (diff) | |
| download | volse-hubzilla-2ccff45221905981c6942f1f3064d477113e959e.tar.gz volse-hubzilla-2ccff45221905981c6942f1f3064d477113e959e.tar.bz2 volse-hubzilla-2ccff45221905981c6942f1f3064d477113e959e.zip | |
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.
| -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 |