diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-26 12:49:02 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-26 12:49:02 -0800 |
| commit | 6126070a1d53c3ef4f59c8a0a6160610ef16563c (patch) | |
| tree | 2ffd507342edfa4db3ee516d6b7468597bef37cf /include/photos.php | |
| parent | 459166116d926df23c73a839f3c87c2cfd2ba4ab (diff) | |
| parent | 776bc51172f5c21348c674a8bb6bf5037bde6815 (diff) | |
| download | volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.tar.gz volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.tar.bz2 volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/photos.php')
| -rw-r--r-- | include/photos.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/photos.php b/include/photos.php index 1a57ce76f..be18600de 100644 --- a/include/photos.php +++ b/include/photos.php @@ -296,7 +296,7 @@ function photo_upload($channel, $observer, $args) { $photo_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . t('a new photo') . '[/zrl]'; - $album_link = '[zrl=' . z_root() . '/photos/album/' . bin2hex($album) . ']' . $album . '[/zrl]'; + $album_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album) . ']' . $album . '[/zrl]'; $activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link); |