diff options
| author | Olivier Migeot <olivier@migeot.org> | 2011-04-12 13:55:43 +0200 |
|---|---|---|
| committer | Olivier Migeot <olivier@migeot.org> | 2011-04-12 13:55:43 +0200 |
| commit | 85f709320b588f3231875d097217bd9abd223c9f (patch) | |
| tree | 988f92ae345657ece74dbcc9dd0d8f17d41f20a5 /mod/photos.php | |
| parent | 294577a48b2d6356dd7695716ea0379bf3a087df (diff) | |
| parent | 6da84027afa18633ac5d5dacce99bb244be2aa7b (diff) | |
| download | volse-hubzilla-85f709320b588f3231875d097217bd9abd223c9f.tar.gz volse-hubzilla-85f709320b588f3231875d097217bd9abd223c9f.tar.bz2 volse-hubzilla-85f709320b588f3231875d097217bd9abd223c9f.zip | |
Merge remote branch 'mike/master'
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/mod/photos.php b/mod/photos.php index 061542c75..757b4685d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1105,6 +1105,8 @@ function photos_content(&$a) { '$mylink' => $contact['url'], '$mytitle' => t('This is you'), '$myphoto' => $contact['thumb'], + '$comment' => t('Comment'), + '$submit' => t('Submit'), '$ww' => '' )); } @@ -1257,17 +1259,14 @@ function photos_content(&$a) { if(count($r)) { foreach($r as $rr) { $o .= replace_macros($tpl,array( - '$id' => $rr['id'], - '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] - . '/image/' . $rr['resource-id'], + '$id' => $rr['id'], + '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], '$phototitle' => t('View Photo'), - '$imgsrc' => $a->get_baseurl() . '/photo/' - . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg', - '$albumlink' => $a->get_baseurl() . '/photos/' - . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), - '$albumname' => $rr['album'], - '$albumalt' => t('View Album'), - '$imgalt' => $rr['filename'] + '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg', + '$albumlink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), + '$albumname' => $rr['album'], + '$albumalt' => t('View Album'), + '$imgalt' => $rr['filename'] )); } |