move all theme initialisation to one place - just after calling module_init. Revert if there are serious issues, but please note the issues in as much detail as possible so we can work through them.
This commit is contained in:
22
mod/page.php
22
mod/page.php
@@ -14,13 +14,11 @@ function page_init(&$a) {
|
||||
if($a->profile['profile_uid'])
|
||||
head_set_icon($a->profile['thumb']);
|
||||
|
||||
}
|
||||
|
||||
// load the item here in the init function because we need to extract
|
||||
// the page layout and initialise the correct theme.
|
||||
|
||||
|
||||
|
||||
function page_content(&$a) {
|
||||
|
||||
$observer = $a->get_observer();
|
||||
$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
|
||||
|
||||
@@ -97,11 +95,27 @@ function page_content(&$a) {
|
||||
}
|
||||
}
|
||||
|
||||
$a->data['webpage'] = $r;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function page_content(&$a) {
|
||||
|
||||
$r = $a->data['webpage'];
|
||||
if(! $r)
|
||||
return;
|
||||
|
||||
// logger('layout: ' . print_r($a->layout,true));
|
||||
|
||||
// Use of widgets should be determined by Comanche, but we don't have it on system pages yet, so...
|
||||
|
||||
// I recommend we now get rid of this bit - it's quite a hack to work around... - mike
|
||||
|
||||
if ($perms['write_pages']) {
|
||||
$chan = $a->channel['channel_id'];
|
||||
$who = $channel_address;
|
||||
|
||||
Reference in New Issue
Block a user