diff options
| author | friendica <info@friendica.com> | 2013-02-03 19:53:16 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-02-03 19:53:16 -0800 |
| commit | fb2b21626ece67862708600b11acb4c748c649f4 (patch) | |
| tree | b7235060aab66d81afc4398060b23936377f5367 | |
| parent | 9dcecb6b3704037cb13e8a6350b5df83f6917a40 (diff) | |
| download | volse-hubzilla-fb2b21626ece67862708600b11acb4c748c649f4.tar.gz volse-hubzilla-fb2b21626ece67862708600b11acb4c748c649f4.tar.bz2 volse-hubzilla-fb2b21626ece67862708600b11acb4c748c649f4.zip | |
clearly a chanview link is not going to work there, go back to zid.
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | mod/wall_upload.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 200e876d9..94865e783 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -310,7 +310,7 @@ function localize_item(&$item){ // add zid's to public images if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) { foreach($matches as $mtch) { - $item['body'] = str_replace($mtch[0],'[url=' . chanlink_url($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5] . '[/img][/url]',$item['body']); + $item['body'] = str_replace($mtch[0],'[url=' . zid( $mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3]) . '][img' . $mtch[4] . ']h' . $mtch[5] . '[/img][/url]',$item['body']); } } diff --git a/mod/wall_upload.php b/mod/wall_upload.php index a3dcf9a0b..b249dec4e 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -169,11 +169,11 @@ function wall_upload_post(&$a) { $basename = basename($filename); if($_REQUEST['silent']) { - $m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]"; + $m = '[url=' . $a->get_baseurl() . '/photos/' . $channel['channel_address'] . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]"; return($m); } else { - echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n"; + echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $channel['channel_address'] . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n"; } killme(); |