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 /include/oauth.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 'include/oauth.php')
| -rw-r--r-- | include/oauth.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oauth.php b/include/oauth.php index f3d144158..ec41a5dd2 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -27,7 +27,7 @@ class ZotOAuth1DataStore extends OAuth1DataStore { ); if($r) { - get_app()->set_oauth_key($consumer_key); + App::set_oauth_key($consumer_key); return new OAuth1Consumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']); } return null; |