diff --git a/mod/photos.php b/mod/photos.php index a1aebfac66..2f9c5ca310 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -937,11 +937,17 @@ function photos_content(App $a) $nxt = null; foreach ($prvnxt as $z => $entry) { if ($entry['resource-id'] == $ph[0]['resource-id']) { - $prv = $z - 1; - $nxt = $z + 1; + $prv = ($order_field === 'created') ? ($z - 1) : ($z + 1); + $nxt = ($order_field === 'created') ? ($z + 1) : ($z - 1); if ($prv < 0) { $prv = count($prvnxt) - 1; } + if ($nxt < 0) { + $nxt = count($prvnxt) - 1; + } + if ($prv >= count($prvnxt)) { + $prv = 0; + } if ($nxt >= count($prvnxt)) { $nxt = 0; }