fix profile redirect url in dfrn_poll

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index f288e9bebe6630f9462eefa8a8abd0e53d7f4253..cd67df1d7c8da9d1cbeefde0161d19c6d4390edb 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -262,10 +262,13 @@ function dfrn_notify_post(&$a) {
                                        $when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
                        }
                        if($deleted) {
-                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+
+                               $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
                                        dbesc($uri),
-                                       intval($importer['importer_uid'])
+                                       intval($importer['importer_uid']),
+                                       intval($importer['id'])
                                );
+
                                if(count($r)) {
                                        $item = $r[0];
 
@@ -471,8 +474,8 @@ function dfrn_notify_post(&$a) {
                                                                '$body' => html_entity_decode(strip_tags(bbcode(stripslashes($datarray['body']))), ENT_QUOTES, 'UTF-8')
                                                        ));
 
-                                                       $res = mail($importer['email'], sprintf(t("%s commented on an item at %s"), $from ,$a->config['sitename']),
-                                                               $email_tpl,t("From: Administrator@") . $a->get_hostname() );
+                                                       $res = mail($importer['email'], sprintf( t("%s commented on an item at %s") , $from ,$a->config['sitename']),
+                                                               $email_tpl, "From: ".t("Administrator") . "@". $a->get_hostname() );
                                                        break;
                                                }
                                        }