diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/api.php | 11 | ||||
| -rw-r--r-- | include/api_auth.php | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php index 1fb48d553..fd6883f44 100644 --- a/include/api.php +++ b/include/api.php @@ -112,8 +112,11 @@ require_once('include/api_auth.php'); break; case "json": header ("Content-Type: application/json"); - foreach($r as $rr) + foreach($r as $rr) { + if(! $rr) + $rr = array(); $json = json_encode($rr); + } if ($_GET['callback']) $json = $_GET['callback']."(".$json.")"; return $json; @@ -1079,6 +1082,8 @@ require_once('include/api_auth.php'); 'contributors' => '' ); $status_info['user'] = $user_info; + if(array_key_exists('status',$status_info['user'])) + unset($status_info['user']['status']); } return api_apply_template("status", $type, array('$status' => $status_info)); @@ -1320,6 +1325,8 @@ require_once('include/api_auth.php'); // params $id = intval(argv(3)); + if(! $id) + $id = $_REQUEST['id']; logger('API: api_statuses_show: '.$id); @@ -1336,10 +1343,12 @@ require_once('include/api_auth.php'); $r = q("select * from item where true $item_normal $sql_extra", intval($id) ); + xchan_query($r,true); $ret = api_format_items($r,$user_info); + if ($conversation) { $data = array('$statuses' => $ret); return api_apply_template("timeline", $type, $data); diff --git a/include/api_auth.php b/include/api_auth.php index c9978c99d..e3697adb0 100644 --- a/include/api_auth.php +++ b/include/api_auth.php @@ -28,7 +28,7 @@ function api_login(&$a){ killme(); } catch(Exception $e) { - logger(__file__.__line__.__function__."\n".$e); + logger($e->getMessage()); } // workarounds for HTTP-auth in CGI mode |