Replace remaining $a->page by DI::page()

diff --git a/doc/Addons.md b/doc/Addons.md
index 6e975650034c332ff8907e0c5654abafd6649647..d448b026b8cd8cf6d1fa23cf11cd747161c106f1 100644 (file)
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -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

diff --git a/doc/de/Addons.md b/doc/de/Addons.md
index b5dd07cca2305965806ee1b72faaf62108459042..32add2181ebbd60694d9a387ca2fba89a41c3b15 100644 (file)
--- a/doc/de/Addons.md
+++ b/doc/de/Addons.md
@@ -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

diff --git a/doc/themes.md b/doc/themes.md
index d2e4c59be3edee9fbcaf1f3454815eecefe02868..6193fa2d22c04919f5075d50750f5390ae8ca25e 100644 (file)
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -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;
 

diff --git a/mod/message.php b/mod/message.php
index 5c84838965bd8dc5bb99fa3d1708bf253e6a2fe5..4f3acdee5521545717d9b9907184dd8de8a1edb0 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -143,7 +143,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?'),

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 85590d0c66e1cf0940d47a359dd305940d6751f1..85afc149b6e90b96ff96dc23a273d0d3b817c0ab 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -931,7 +931,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(),
@@ -947,7 +947,7 @@ class Contact extends BaseModule
                }
 
                if (DBA::isResult($contact)) {
-                       $a->page['aside'] = '';
+                       DI::page()['aside'] = '';
 
                        $profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
@@ -965,7 +965,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']);