diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
| commit | 0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch) | |
| tree | a92197de4503ec52889dc05483493f4df1a305b8 /mod/blocks.php | |
| parent | 99d9456b3addc651a68874ddd391d25684252c4d (diff) | |
| parent | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff) | |
| download | volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2 volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'mod/blocks.php')
| -rw-r--r-- | mod/blocks.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mod/blocks.php b/mod/blocks.php index 97cc5cd53..96005e9a3 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -9,7 +9,7 @@ function blocks_init(&$a) { if(argc() > 1 && argv(1) === 'sys' && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { - $a->is_sys = true; + App::$is_sys = true; } } @@ -25,24 +25,24 @@ function blocks_init(&$a) { function blocks_content(&$a) { - if(! $a->profile) { + if(! App::$profile) { notice( t('Requested profile is not available.') . EOL ); - $a->error = 404; + App::$error = 404; return; } $which = argv(1); - $_SESSION['return_url'] = $a->query_string; + $_SESSION['return_url'] = App::$query_string; $uid = local_channel(); $owner = 0; $channel = null; - $observer = $a->get_observer(); + $observer = App::get_observer(); - $channel = $a->get_channel(); + $channel = App::get_channel(); - if($a->is_sys && is_site_admin()) { + if(App::$is_sys && is_site_admin()) { $sys = get_sys_channel(); if($sys && intval($sys['channel_id'])) { $uid = $owner = intval($sys['channel_id']); @@ -86,7 +86,7 @@ function blocks_content(&$a) { $x = array( 'webpage' => ITEM_TYPE_BLOCK, 'is_owner' => true, - 'nickname' => $a->profile['channel_address'], + 'nickname' => App::$profile['channel_address'], 'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => '', 'showacl' => false, |