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/api.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/api.php')
| -rw-r--r-- | mod/api.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/api.php b/mod/api.php index 232349292..aa95b81dd 100644 --- a/mod/api.php +++ b/mod/api.php @@ -27,7 +27,7 @@ function api_post(&$a) { return; } - if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_channel()) { + if(count(App::$user) && x(App::$user,'uid') && App::$user['uid'] != local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -35,13 +35,13 @@ function api_post(&$a) { } function api_content(&$a) { - if($a->cmd=='api/oauth/authorize'){ + if(App::$cmd=='api/oauth/authorize'){ /* * api/oauth/authorize interact with the user. return a standard page */ - $a->page['template'] = "minimal"; + App::$page['template'] = "minimal"; // get consumer/client from request token try { |