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 /include/permissions.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 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/permissions.php b/include/permissions.php index 8f593640c..19242d29f 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -63,7 +63,7 @@ function get_perms() { */ function get_all_perms($uid, $observer_xchan, $internal_use = true) { - $api = get_app()->get_oauth_key(); + $api = App::get_oauth_key(); if($api) return get_all_api_perms($uid,$api); @@ -270,7 +270,7 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) { */ function perm_is_allowed($uid, $observer_xchan, $permission) { - $api = get_app()->get_oauth_key(); + $api = App::get_oauth_key(); if($api) return api_perm_is_allowed($uid,$api,$permission); |