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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
friendica 2015-04-07 13:52:31 -07:00
commit d78118e2b0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/RedDAV/RedBrowser.php
View File

@ -271,18 +271,19 @@ class RedBrowser extends DAV\Browser\Plugin {
'$nick' => $this->auth->getCurrentUser() '$nick' => $this->auth->getCurrentUser()
)); ));
get_app()->page['content'] = $html; $a = get_app();
load_pdl(get_app()); $a->page['content'] = $html;
load_pdl($a);
$theme_info_file = "view/theme/" . current_theme() . "/php/theme.php"; $theme_info_file = "view/theme/" . current_theme() . "/php/theme.php";
if (file_exists($theme_info_file)){ if (file_exists($theme_info_file)){
require_once($theme_info_file); require_once($theme_info_file);
if (function_exists(str_replace('-', '_', current_theme()) . '_init')) { if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
$func = str_replace('-', '_', current_theme()) . '_init'; $func = str_replace('-', '_', current_theme()) . '_init';
$func(get_app()); $func($a);
} }
} }
construct_page(get_app()); construct_page($a);
} }
/** /**