mirror of
https://github.com/friendica/friendica
synced 2024-12-22 17:20:16 +00:00
Merge pull request #8037 from MrPetovan/bug/notices
Replace remaining $a->page by DI::page()
This commit is contained in:
commit
b9dba631aa
5 changed files with 12 additions and 12 deletions
|
@ -472,14 +472,14 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
|
|||
|
||||
Hook::callAll('init_1');
|
||||
Hook::callAll('app_menu', $arr);
|
||||
Hook::callAll('page_content_top', $a->page['content']);
|
||||
Hook::callAll('page_content_top', DI::page()['content']);
|
||||
Hook::callAll($a->module.'_mod_init', $placeholder);
|
||||
Hook::callAll($a->module.'_mod_init', $placeholder);
|
||||
Hook::callAll($a->module.'_mod_post', $_POST);
|
||||
Hook::callAll($a->module.'_mod_afterpost', $placeholder);
|
||||
Hook::callAll($a->module.'_mod_content', $arr);
|
||||
Hook::callAll($a->module.'_mod_aftercontent', $arr);
|
||||
Hook::callAll('page_end', $a->page['content']);
|
||||
Hook::callAll('page_end', DI::page()['content']);
|
||||
|
||||
### include/api.php
|
||||
|
||||
|
@ -703,7 +703,7 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
|
|||
|
||||
### src/Content/Nav.php
|
||||
|
||||
Hook::callAll('page_header', $a->page['nav']);
|
||||
Hook::callAll('page_header', DI::page()['nav']);
|
||||
Hook::callAll('nav_info', $nav);
|
||||
|
||||
### src/Worker/Directory.php
|
||||
|
|
|
@ -195,14 +195,14 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
|
|||
|
||||
Hook::callAll('init_1');
|
||||
Hook::callAll('app_menu', $arr);
|
||||
Hook::callAll('page_content_top', $a->page['content']);
|
||||
Hook::callAll('page_content_top', DI::page()['content']);
|
||||
Hook::callAll($a->module.'_mod_init', $placeholder);
|
||||
Hook::callAll($a->module.'_mod_init', $placeholder);
|
||||
Hook::callAll($a->module.'_mod_post', $_POST);
|
||||
Hook::callAll($a->module.'_mod_afterpost', $placeholder);
|
||||
Hook::callAll($a->module.'_mod_content', $arr);
|
||||
Hook::callAll($a->module.'_mod_aftercontent', $arr);
|
||||
Hook::callAll('page_end', $a->page['content']);
|
||||
Hook::callAll('page_end', DI::page()['content']);
|
||||
|
||||
### include/api.php
|
||||
|
||||
|
@ -418,7 +418,7 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
|
|||
|
||||
### src/Content/Nav.php
|
||||
|
||||
Hook::callAll('page_header', $a->page['nav']);
|
||||
Hook::callAll('page_header', DI::page()['nav']);
|
||||
Hook::callAll('nav_info', $nav);
|
||||
|
||||
### src/Core/Authentication.php
|
||||
|
|
|
@ -142,7 +142,7 @@ There you'll find somethink alike
|
|||
$colorset = Config::get('duepuntozero', 'colorset');
|
||||
if ($colorset) {
|
||||
if ($colorset == 'greenzero')
|
||||
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";
|
||||
DI::page()['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";
|
||||
/* some more variants */
|
||||
}
|
||||
|
||||
|
@ -281,7 +281,7 @@ which declares *duepuntozero* as parent of the theme.
|
|||
If you want to add something to the HTML header of the theme, one way to do so is by adding it to the theme.php file.
|
||||
To do so, add something alike
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
DI::page()['htmlhead'] .= <<< EOT
|
||||
/* stuff you want to add to the header */
|
||||
EOT;
|
||||
|
||||
|
|
|
@ -141,7 +141,7 @@ function message_content(App $a)
|
|||
}
|
||||
}
|
||||
|
||||
//$a->page['aside'] = '';
|
||||
//DI::page()['aside'] = '';
|
||||
return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
|
||||
'$method' => 'get',
|
||||
'$message' => L10n::t('Do you really want to delete this message?'),
|
||||
|
|
|
@ -930,7 +930,7 @@ class Contact extends BaseModule
|
|||
'default_location' => $a->user['default-location'],
|
||||
'nickname' => $a->user['nickname'],
|
||||
'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
|
||||
'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true),
|
||||
'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true),
|
||||
'bang' => '',
|
||||
'visitor' => 'block',
|
||||
'profile_uid' => local_user(),
|
||||
|
@ -946,7 +946,7 @@ class Contact extends BaseModule
|
|||
}
|
||||
|
||||
if (DBA::isResult($contact)) {
|
||||
$a->page['aside'] = '';
|
||||
DI::page()['aside'] = '';
|
||||
|
||||
$profiledata = Model\Contact::getDetailsByURL($contact['url']);
|
||||
|
||||
|
@ -964,7 +964,7 @@ class Contact extends BaseModule
|
|||
$o = self::getTabsHTML($a, $contact, 2);
|
||||
|
||||
if (DBA::isResult($contact)) {
|
||||
$a->page['aside'] = '';
|
||||
DI::page()['aside'] = '';
|
||||
|
||||
$profiledata = Model\Contact::getDetailsByURL($contact['url']);
|
||||
|
||||
|
|
Loading…
Reference in a new issue