aboutsummaryrefslogtreecommitdiffstats
path: root/include/message.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-15 22:33:37 -0700
committerfriendica <info@friendica.com>2012-08-15 22:33:37 -0700
commitf7c6a6ff9071c120f5bd6efe51cdb934e0c30cc7 (patch)
tree586454a21f87a8f9a5e75073ac065cfbbae935a4 /include/message.php
parent77b334efbce9eb9aef825b968a2c852da21bfe94 (diff)
downloadvolse-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/message.php')
-rw-r--r--include/message.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/message.php b/include/message.php
index 377d7c715..0f31b116a 100644
--- a/include/message.php
+++ b/include/message.php
@@ -36,7 +36,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
if(strlen($replyto)) {
$reply = true;
- $r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent-uri` = '%s' ) limit 1",
+ $r = q("select convid from mail where uid = %d and ( uri = '%s' or `parent_uri` = '%s' ) limit 1",
intval(local_user()),
dbesc($replyto),
dbesc($replyto)
@@ -88,7 +88,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
- `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`)
+ `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent_uri`, `created`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
intval(local_user()),
dbesc(get_guid()),
@@ -217,7 +217,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
}
$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
- `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
+ `contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent_uri`, `created`, `unknown`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
intval($recipient['uid']),
dbesc(get_guid()),