From de5125a4c72309d5b167916e905eed1cad8d2679 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 30 Mar 2017 21:45:35 +0200 Subject: [PATCH] merged 2 if() into one as requested by CR Signed-off-by: Roland Haeder --- mod/photos.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 1467dff34..92682f443 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1271,11 +1271,8 @@ function photos_content(App $a) { } } } else { - /// @TODO merge else+if into elseif and 2 into one? - if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { - if ($can_post) { - $edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'); - } + if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos')) && $can_post) { + $edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'); } }