Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	view/nl/messages.po
	view/nl/strings.php

1 files changed, 3 insertions, 3 deletions

diff --git a/mod/photos.php b/mod/photos.php
index 1fbee70e8..68077a5b1 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -528,7 +528,7 @@ function photos_content(&$a) {
 			$lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
 		}
 
-		$aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : '');
+		$aclselect = (($_is_owner) ? populate_acl($channel_acl,false) : '');
 
 		$selname = (($datum) ? hex2bin($datum) : '');
 
@@ -546,7 +546,7 @@ function photos_content(&$a) {
 			'$albums' => $albums['albums'],
 			'$selname' => $selname,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => $aclselect_e,
+			'$aclselect' => $aclselect,
 			'$lockstate' => $lockstate,
 			'$uploader' => $ret['addon_text'],
 			'$default' => (($ret['default_upload']) ? true : false),
@@ -892,7 +892,7 @@ function photos_content(&$a) {
 		if($can_post) {
 			$album_e = $ph[0]['album'];
 			$caption_e = $ph[0]['description'];
-			$aclselect_e = populate_acl($ph[0]);
+			$aclselect_e = (($_is_owner) ? populate_acl($ph[0]) : '');
 			$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
 
 			$_SESSION['album_return'] = bin2hex($ph[0]['album']);