The CSS code for shared messages is moved from "vier" to the global.css, so that...

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 1de45255e9497ae3186525aeca9600932a7212e4..a3d4838b0ea87da4aac1e426da781c196560a195 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -157,7 +157,7 @@ function delivery_run(&$argv, &$argc){
                $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, 
                        `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, 
                        `user`.`page-flags`, `user`.`prvnets`
-                       FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+                       FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                        WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
                        intval($uid)
                );
@@ -319,7 +319,7 @@ function delivery_run(&$argv, &$argc){
                                                `contact`.`name` as `senderName`,
                                                `user`.* 
                                                FROM `contact` 
-                                               LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
+                                               INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` 
                                                WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
                                                AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
                                                $sql_extra
@@ -366,7 +366,6 @@ function delivery_run(&$argv, &$argc){
                                break;
 
                        case NETWORK_OSTATUS :
-
                                // Do not send to otatus if we are not configured to send to public networks
                                if($owner['prvnets'])
                                        break;
@@ -386,7 +385,7 @@ function delivery_run(&$argv, &$argc){
                                                // private emails may be in included in public conversations. Filter them.
                                                if(($public_message) && $item['private'] == 1)
                                                        continue;
-       
+
                                                $item_contact = get_item_contact($item,$icontacts);
                                                if(! $item_contact)
                                                        continue;