harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
friendica
2014-10-20 16:47:58 -07:00
parent c909b8be06
commit cb15c73dae
5 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
boot.php
View File

@@ -1880,13 +1880,9 @@ function get_custom_nav(&$a,$navname) {
}
function construct_page(&$a) {
function load_pdl(&$a) {
require_once('include/comanche.php');
// 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)) {
$n = 'mod_' . $a->module . '.pdl' ;
$u = comanche_get_channel_id();
@@ -1898,12 +1894,20 @@ function construct_page(&$a) {
comanche_parser($a,$s);
}
$comanche = ((count($a->layout)) ? true : false);
}
function construct_page(&$a) {
/**
* Build the page - now that we have all the components
*/
$comanche = ((count($a->layout)) ? true : false);
require_once(theme_include('theme_init.php'));
$installing = false;