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/id.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/id.php')
-rw-r--r-- | mod/id.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/id.php b/mod/id.php index bd4c1fa89..382df45d8 100644 --- a/mod/id.php +++ b/mod/id.php @@ -46,12 +46,12 @@ function id_init(&$a) { if(argc() > 1) { $which = argv(1); } else { - $a->error = 404; + App::$error = 404; return; } $profile = ''; - $channel = $a->get_channel(); + $channel = App::get_channel(); profile_load($a,$which,$profile); $op = new MysqlProvider; @@ -69,7 +69,7 @@ function id_init(&$a) { function getUserData($handle = null) { if (! local_channel()) { notice( t('Permission denied.') . EOL); - get_app()->page['content'] = login(); + App::$page['content'] = login(); return false; } @@ -235,7 +235,7 @@ class MysqlProvider extends LightOpenIDProvider { . '<button name="cancel">cancel</button> ' . '</form>'; - get_app()->page['content'] .= $o; + App::$page['content'] .= $o; } function checkid($realm, &$attributes) { @@ -279,7 +279,7 @@ class MysqlProvider extends LightOpenIDProvider { function assoc_handle() { logger('assoc_handle'); - $channel = get_app()->get_channel(); + $channel = App::get_channel(); return z_root() . '/channel/' . $channel['channel_address']; } |