diff options
| author | friendica <info@friendica.com> | 2012-08-15 22:33:37 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-08-15 22:33:37 -0700 |
| commit | f7c6a6ff9071c120f5bd6efe51cdb934e0c30cc7 (patch) | |
| tree | 586454a21f87a8f9a5e75073ac065cfbbae935a4 /include/api.php | |
| parent | 77b334efbce9eb9aef825b968a2c852da21bfe94 (diff) | |
| download | volse-hubzilla-f7c6a6ff9071c120f5bd6efe51cdb934e0c30cc7.tar.gz volse-hubzilla-f7c6a6ff9071c120f5bd6efe51cdb934e0c30cc7.tar.bz2 volse-hubzilla-f7c6a6ff9071c120f5bd6efe51cdb934e0c30cc7.zip | |
item table rename parent-uri, target-type, object-type (more to come later)
Diffstat (limited to 'include/api.php')
| -rw-r--r-- | include/api.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/api.php b/include/api.php index 456d984de..296fba1a7 100644 --- a/include/api.php +++ b/include/api.php @@ -1357,7 +1357,7 @@ 'contributors' => '', 'annotations' => '', 'entities' => '', - 'objecttype' => (($item['object-type']) ? $item['object-type'] : ACTIVITY_OBJ_NOTE), + 'objecttype' => (($item['obj_type']) ? $item['obj_type'] : ACTIVITY_OBJ_NOTE), 'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST), 'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type, 'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type, @@ -1573,10 +1573,10 @@ $replyto = ''; $sub = ''; if (x($_REQUEST,'replyto')) { - $r = q('SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', + $r = q('SELECT `parent_uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', intval(local_user()), intval($_REQUEST['replyto'])); - $replyto = $r[0]['parent-uri']; + $replyto = $r[0]['parent_uri']; $sub = $r[0]['title']; } else { @@ -1628,7 +1628,7 @@ $sql_extra = "`from-url`='".dbesc( $profile_url )."'"; } elseif ($box=="conversation") { - $sql_extra = "`parent-uri`='".dbesc( $_GET["uri"] ) ."'"; + $sql_extra = "`parent_uri`='".dbesc( $_GET["uri"] ) ."'"; } elseif ($box=="all") { $sql_extra = "true"; |