Index: openacs-4/packages/photo-album/www/photos-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/photos-edit.tcl	6 Sep 2013 17:17:44 -0000	1.6
+++ openacs-4/packages/photo-album/www/photos-edit.tcl	14 Oct 2013 17:56:30 -0000	1.7
@@ -62,11 +62,11 @@
   and ci.item_id = :album_id
 }
 # to move an album need write on album and write on parent folder
-set move_p [expr $write_p  && $folder_write_p]
+set move_p [expr {$write_p  && $folder_write_p}]
 
 # to delete an album, album must be empty, need delete on album, and write on parent folder
-set has_children_p [expr [pa_count_photos_in_album $album_id] > 0]
-set delete_p [expr !($has_children_p) && $album_delete_p && $folder_write_p]
+set has_children_p [expr {[pa_count_photos_in_album $album_id] > 0}]
+set delete_p [expr {!($has_children_p) && $album_delete_p && $folder_write_p}]
 
 set photos_on_page [pa_all_photos_on_page $album_id $page]
 
@@ -146,8 +146,8 @@
         set val(viewer_path) $viewer_path
         set val(viewer_height) $viewer_height
         set val(viewer_width) $viewer_width
-        set val(window_height) [expr $viewer_height + 28]
-        set val(window_width) [expr $viewer_width + 24]
+        set val(window_height) [expr {$viewer_height + 28}]
+        set val(window_width) [expr {$viewer_width + 24}]
         set child($photo_id) [array get val]
     }