diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/id.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
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']; } |