diff options
| -rwxr-xr-x | boot.php | 14 | ||||
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 1 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 13 insertions, 6 deletions
@@ -1807,8 +1807,18 @@ function construct_page(&$a) { // 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)); + if(! count($a->layout)) { + $n = 'mod_' . $a->module . '.pdl' ; + $u = get_theme_uid(); + if((! $u) && $a->profile_uid) + $u = $a->profile_uid; + if($u) + $s = get_pconfig($u,'system',$n); + if((! $s) && (($p = theme_include($n)) != '')) + $s = @file_get_contents($p); + if($s) + comanche_parser($a,$s); + } $comanche = ((count($a->layout)) ? true : false); diff --git a/include/identity.php b/include/identity.php index 2e611625a..93174031c 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1112,8 +1112,6 @@ function get_theme_uid() { if(local_user()) { if((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid)) return local_user(); - if(! $uid) - return local_user(); } if(! $uid) { $x = get_sys_channel(); diff --git a/mod/settings.php b/mod/settings.php index b88380ff0..13cb3cae9 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -439,7 +439,6 @@ function settings_post(&$a) { dbesc($str_group_deny), intval(local_user()) ); - if($r) info( t('Settings updated.') . EOL); diff --git a/version.inc b/version.inc index adf85ba7e..5e33a16d7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-02-24.598 +2014-02-25.599 |