diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-07 13:52:31 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-07 13:52:31 -0700 |
| commit | d78118e2b0eee173f50c57f14ae8733e8412c502 (patch) | |
| tree | 5ebc2429a1ca87b0b2b3788e2ad26ee3953b1add | |
| parent | 558246257c4cbc91b55884b3d6252e41858b9955 (diff) | |
| parent | dbb3cda9a65f1687de730efb477a098e39358e71 (diff) | |
| download | volse-hubzilla-d78118e2b0eee173f50c57f14ae8733e8412c502.tar.gz volse-hubzilla-d78118e2b0eee173f50c57f14ae8733e8412c502.tar.bz2 volse-hubzilla-d78118e2b0eee173f50c57f14ae8733e8412c502.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php index 56d18ded6..a0330d7cc 100644 --- a/include/RedDAV/RedBrowser.php +++ b/include/RedDAV/RedBrowser.php @@ -271,18 +271,19 @@ class RedBrowser extends DAV\Browser\Plugin { '$nick' => $this->auth->getCurrentUser() )); - get_app()->page['content'] = $html; - load_pdl(get_app()); + $a = get_app(); + $a->page['content'] = $html; + load_pdl($a); $theme_info_file = "view/theme/" . current_theme() . "/php/theme.php"; if (file_exists($theme_info_file)){ require_once($theme_info_file); if (function_exists(str_replace('-', '_', current_theme()) . '_init')) { $func = str_replace('-', '_', current_theme()) . '_init'; - $func(get_app()); + $func($a); } } - construct_page(get_app()); + construct_page($a); } /** |