From: Jay R. <cry...@us...> - 2004-07-30 07:51:49
|
Update of /cvsroot/gallery/gallery In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20310 Modified Files: Tag: BRANCH_1_4_4 ChangeLog Version.php view_comments.php Log Message: 2004-07-29 Jay Rossiter <cry...@us...> 1.4.4-pl1-cvs-b1 * Fix: view_comments would display albums without read permissions (user could not see anything except highlight image and album title) Index: ChangeLog =================================================================== RCS file: /cvsroot/gallery/gallery/ChangeLog,v retrieving revision 1.1225.2.48 retrieving revision 1.1225.2.49 diff -u -d -r1.1225.2.48 -r1.1225.2.49 --- ChangeLog 29 Jul 2004 22:00:43 -0000 1.1225.2.48 +++ ChangeLog 30 Jul 2004 07:51:37 -0000 1.1225.2.49 @@ -1,3 +1,8 @@ +2004-07-29 Jay Rossiter <cry...@us...> 1.4.4-pl1-cvs-b1 + + * Fix: view_comments would display albums without read permissions + (user could not see anything except highlight image and album title) + 2004-07-29 Chris Kelly <ck...@us...> 1.4.4 * 1.4.4 Release Index: Version.php =================================================================== RCS file: /cvsroot/gallery/gallery/Version.php,v retrieving revision 1.972.2.43 retrieving revision 1.972.2.44 diff -u -d -r1.972.2.43 -r1.972.2.44 --- Version.php 29 Jul 2004 22:00:45 -0000 1.972.2.43 +++ Version.php 30 Jul 2004 07:51:37 -0000 1.972.2.44 @@ -31,7 +31,7 @@ $gallery = new stdClass(); } -$gallery->version = '1.4.4'; +$gallery->version = '1.4.4-pl1-cvs-b1'; $gallery->config_version = 82; $gallery->album_version = 31; $gallery->user_version = 5; Index: view_comments.php =================================================================== RCS file: /cvsroot/gallery/gallery/view_comments.php,v retrieving revision 1.32.2.2 retrieving revision 1.32.2.3 diff -u -d -r1.32.2.2 -r1.32.2.3 --- view_comments.php 27 Jul 2004 08:08:15 -0000 1.32.2.2 +++ view_comments.php 30 Jul 2004 07:51:37 -0000 1.32.2.3 @@ -142,7 +142,7 @@ $myAlbumName = $gallery->album->getAlbumName($i); $myAlbum = new Album(); $myAlbum->load($myAlbumName); - if ((!$gallery->album->isHidden($i) || $gallery->user->isAdmin() || + if (((!$gallery->album->isHidden($i) && $gallery->user->canReadAlbum($myAlbum)) || $gallery->user->isAdmin() || $gallery->user->isOwnerOfAlbum($gallery->album) || $gallery->user->isOwnerOfAlbum($myAlbum))) { $embeddedAlbum = 1; |