diff options
| author | friendica <info@friendica.com> | 2014-10-19 16:12:05 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-19 16:12:05 -0700 |
| commit | bae3029c639bf6f9469dd93bfedc3dce0d8510d7 (patch) | |
| tree | f892b4bb5bc96c96ebd9df5d6b593b02def2c759 /mod/photos.php | |
| parent | 6d3619c8b15afdbf228cc0ca71de68efc0557fb1 (diff) | |
| download | volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.tar.gz volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.tar.bz2 volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.zip | |
merge madness
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/photos.php b/mod/photos.php index 2b859b7f1..4c52c7ef7 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -956,7 +956,7 @@ function photos_content(&$a) { $edit = array( 'edit' => t('Edit photo'), - 'id' => $ph[0]['id'], + 'id' => $link_item['id'], //$ph[0]['id'], 'rotatecw' => t('Rotate CW (right)'), 'rotateccw' => t('Rotate CCW (left)'), 'albums' => $albums['albums'], @@ -1114,7 +1114,7 @@ function photos_content(&$a) { $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( - '$id' => $ph[0]['id'], + '$id' => $link_item['id'], //$ph[0]['id'], '$album' => $album_e, '$tools' => $tools, '$lock' => $lock, |