diff options
| author | friendica <info@friendica.com> | 2014-10-06 20:54:52 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-06 20:54:52 -0700 |
| commit | bbf88cf6391ec92bf146f0334c1332158c58345a (patch) | |
| tree | 7d495c6864cef159e8effa9fe585d6085cf86d10 | |
| parent | 03585b8f885c7c7482cb58b277af187151dc0887 (diff) | |
| download | volse-hubzilla-bbf88cf6391ec92bf146f0334c1332158c58345a.tar.gz volse-hubzilla-bbf88cf6391ec92bf146f0334c1332158c58345a.tar.bz2 volse-hubzilla-bbf88cf6391ec92bf146f0334c1332158c58345a.zip | |
found one bug trying to fetch the recursive reshare from hell. I still think there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing.
| -rwxr-xr-x | include/diaspora.php | 4 | ||||
| -rw-r--r-- | mod/message.php | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 0d4271cee..758f6e73c 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -928,8 +928,8 @@ function get_diaspora_reshare_xml($url,$recurse = 0) { // see if it's a reshare of a reshare if($source_xml->root_diaspora_id && $source_xml->root_guid && $recurse < 15) { - $orig_author = notags(unxmlify($xml->root_diaspora_id)); - $orig_guid = notags(unxmlify($xml->root_guid)); + $orig_author = notags(unxmlify($source_xml->root_diaspora_id)); + $orig_guid = notags(unxmlify($source_xml->root_guid)); $source_url = 'https://' . substr($orig_author,strpos($orig_author,'@')+1) . '/p/' . $orig_guid . '.xml'; $y = get_diaspora_reshare_xml($source_url,$recurse+1); if($y) diff --git a/mod/message.php b/mod/message.php index c14bf2161..7f3b6180a 100644 --- a/mod/message.php +++ b/mod/message.php @@ -61,18 +61,18 @@ function message_content(&$a) { foreach($r as $rr) { $o .= replace_macros($tpl, array( - '$id' => $rr['id'], - '$from_name' => $rr['from']['xchan_name'], - '$from_url' => chanlink_hash($rr['from_xchan']), + '$id' => $rr['id'], + '$from_name' => $rr['from']['xchan_name'], + '$from_url' => chanlink_hash($rr['from_xchan']), '$from_photo' => $rr['from']['xchan_photo_s'], - '$to_name' => $rr['to']['xchan_name'], - '$to_url' => chanlink_hash($rr['to_xchan']), - '$to_photo' => $rr['to']['xchan_photo_s'], - '$subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'), - '$delete' => t('Delete message'), - '$body' => smilies(bbcode($rr['body'])), - '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')), - '$seen' => $rr['seen'] + '$to_name' => $rr['to']['xchan_name'], + '$to_url' => chanlink_hash($rr['to_xchan']), + '$to_photo' => $rr['to']['xchan_photo_s'], + '$subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'), + '$delete' => t('Delete conversation'), + '$body' => smilies(bbcode($rr['body'])), + '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')), + '$seen' => $rr['seen'] )); } $o .= alt_pager($a,count($r)); |