diff options
| author | friendica <info@friendica.com> | 2013-10-15 15:51:20 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-15 15:51:20 -0700 |
| commit | 100043da38af9e1f01a3943e5bc996ab5311894a (patch) | |
| tree | 944d58f39eb9aae3524aaa90426b40d9b7bc8082 /include/api.php | |
| parent | 66f427db5ea1c27f247ed329521695bc34a8fdd6 (diff) | |
| download | volse-hubzilla-100043da38af9e1f01a3943e5bc996ab5311894a.tar.gz volse-hubzilla-100043da38af9e1f01a3943e5bc996ab5311894a.tar.bz2 volse-hubzilla-100043da38af9e1f01a3943e5bc996ab5311894a.zip | |
oauth wasn't logging in properly, also fixed api status_show to return last public post, not the last private post
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/api.php b/include/api.php index 2760914e9..1dd970cbc 100644 --- a/include/api.php +++ b/include/api.php @@ -72,7 +72,9 @@ require_once('include/photos.php'); // login with oauth try { $oauth = new FKOAuth1(); - list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request()); + $req = OAuthRequest::from_request(); + list($consumer,$token) = $oauth->verify_request($req); +// list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request()); if (!is_null($token)){ $oauth->loginUser($token->uid); call_hooks('logged_in', $a->user); @@ -676,7 +678,6 @@ require_once('include/photos.php'); } } - // call out normal post function require_once('mod/item.php'); @@ -696,7 +697,7 @@ require_once('include/photos.php'); require_once('include/security.php'); $lastwall = q("SELECT * from item where 1 - and item_private != 0 and item_restrict = 0 + and item_private = 0 and item_restrict = 0 and author_xchan = '%s' and allow_cid = '' and allow_gid = '' and deny_cid = '' and deny_gid = '' and verb = '%s' @@ -749,6 +750,7 @@ require_once('include/photos.php'); ); $status_info['user'] = $user_info; } + return api_apply_template("status", $type, array('$status' => $status_info)); } |