aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-06 02:57:33 -0700
committerfriendica <info@friendica.com>2014-04-06 02:57:33 -0700
commitad60e2c566930409d853517ca9392f169fc8e747 (patch)
tree120630a3c0dbf43de66ab5f46714a7f75072e2c5 /include
parenta2b949f3393206ffe2e1195d6abaa883f299b471 (diff)
downloadvolse-hubzilla-ad60e2c566930409d853517ca9392f169fc8e747.tar.gz
volse-hubzilla-ad60e2c566930409d853517ca9392f169fc8e747.tar.bz2
volse-hubzilla-ad60e2c566930409d853517ca9392f169fc8e747.zip
use parent_mid in the parent query for enotify instead of of the parent id. This should fix the issue with encrypted content in the notification messages (for locally posted replies). The fix was a bit harder than anticipated because we store the parent id as an int in the notify table so this had to be modified to char storage as well.
Diffstat (limited to 'include')
-rw-r--r--include/enotify.php17
1 files changed, 9 insertions, 8 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 96a152d31..5be21f180 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -102,7 +102,7 @@ function notification($params) {
if(array_key_exists('item',$params) && (! visible_activity($params['item'])))
return;
- $parent_id = $params['parent'];
+ $parent_mid = $params['parent_mid'];
// Check to see if there was already a notify for this post.
// If so don't create a second notification
@@ -123,9 +123,9 @@ function notification($params) {
$p = null;
- if($params['otype'] === 'item' && $parent_id) {
- $p = q("select * from item where id = %d and uid = %d limit 1",
- intval($parent_id),
+ if($params['otype'] === 'item' && $parent_mid) {
+ $p = q("select * from item where mid = '%s' and uid = %d limit 1",
+ dbesc($parent_mid),
intval($recip['channel_id'])
);
}
@@ -135,6 +135,7 @@ function notification($params) {
$item_post_type = item_post_type($p[0]);
$private = $p[0]['item_private'];
+ $parent_id = $p[0]['id'];
//$possess_desc = str_replace('<!item_type!>',$possess_desc);
@@ -338,7 +339,7 @@ function notification($params) {
$datarray['aid'] = $recip['channel_account_id'];
$datarray['uid'] = $recip['channel_id'];
$datarray['link'] = $itemlink;
- $datarray['parent'] = $parent_id;
+ $datarray['parent'] = $parent_mid;
$datarray['type'] = $params['type'];
$datarray['verb'] = $params['verb'];
$datarray['otype'] = $params['otype'];
@@ -355,7 +356,7 @@ function notification($params) {
// create notification entry in DB
$r = q("insert into notify (hash,name,url,photo,date,aid,uid,link,parent,type,verb,otype)
- values('%s','%s','%s','%s','%s',%d,%d,'%s',%d,%d,'%s','%s')",
+ values('%s','%s','%s','%s','%s',%d,%d,'%s','%s',%d,'%s','%s')",
dbesc($datarray['hash']),
dbesc($datarray['name']),
dbesc($datarray['url']),
@@ -364,7 +365,7 @@ function notification($params) {
intval($datarray['aid']),
intval($datarray['uid']),
dbesc($datarray['link']),
- intval($datarray['parent']),
+ dbesc($datarray['parent']),
intval($datarray['type']),
dbesc($datarray['verb']),
dbesc($datarray['otype'])
@@ -432,7 +433,7 @@ function notification($params) {
$datarray['sitename'] = $sitename;
$datarray['siteurl'] = $siteurl;
$datarray['type'] = $params['type'];
- $datarray['parent'] = $params['parent'];
+ $datarray['parent'] = $params['parent_mid'];
$datarray['source_name'] = $sender['xchan_name'];
$datarray['source_link'] = $sender['xchan_url'];
$datarray['source_photo'] = $sender['xchan_photo_s'];