aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/message.php2
-rw-r--r--mod/ping.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/mod/message.php b/mod/message.php
index d48db8807..60e6b38fc 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -187,7 +187,7 @@ function message_content(&$a) {
$o .= replace_macros($tpl, array(
'$id' => $rr['id'],
'$from_name' =>$rr['from-name'],
- '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl() . '/redir/' . $rr['contact-id'] : $rr['url'],
+ '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl() . '/redir/' . $rr['contact-id'] : $rr['url']),
'$sparkle' => ' sparkle',
'$from_photo' => $rr['thumb'],
'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
diff --git a/mod/ping.php b/mod/ping.php
index 9f6ae1974..df07cb768 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -18,12 +18,14 @@ function ping_init(&$a) {
$friends = array();
$posts = array();
+
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
- `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC",
+ `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
+ ORDER BY `item`.`created` DESC",
intval(local_user())
);