diff options
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/diaspora.php | 3 | ||||
| -rw-r--r-- | mod/message.php | 2 | ||||
| -rw-r--r-- | mod/ping.php | 4 |
4 files changed, 8 insertions, 3 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1180' ); +define ( 'FRIENDICA_VERSION', '2.3.1181' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1107 ); diff --git a/include/diaspora.php b/include/diaspora.php index 8e4f919c5..9cef21ceb 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -41,6 +41,9 @@ function diaspora_dispatch($importer,$msg) { $xmlbase = $parsed_xml->post; + logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DEBUG); + + if($xmlbase->request) { $ret = diaspora_request($importer,$xmlbase->request); } 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()) ); |