Index: openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml	21 Mar 2005 15:36:50 -0000	1.12
+++ openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml	23 Apr 2006 10:09:56 -0000	1.12.2.1
@@ -133,6 +133,7 @@
   <msg key="lt_Move_folder_to_new_fo">Move folder to new folder:</msg>
   <msg key="lt_Move_this_album_to_an">Move this album to another folder</msg>
   <msg key="lt_Move_this_folder_to_a">Move this folder to another folder</msg>
+  <msg key="lt_No_Photo_was_found_fo">No Photo was found for this photo_id</msg>
   <msg key="lt_No_photos_in_the_clip">No photos in the clipboard.</msg>
   <msg key="lt_OPTIONAL_Displayed_on">OPTIONAL, Displayed on the thumbnail page</msg>
   <msg key="lt_OPTIONAL_Displayed_wh">OPTIONAL, Displayed when viewing the photo</msg>
@@ -158,6 +159,7 @@
   <msg key="Name">Name</msg>
   <msg key="Name_title">Name: %title%</msg>
   <msg key="Netx">Next</msg>
+  <msg key="No_Photo">No Photo</msg>
   <msg key="OPTIONAL">OPTIONAL</msg>
   <msg key="or">or</msg>
   <msg key="Photo_clipboard">Photo clipboard</msg>
Index: openacs-4/packages/photo-album/www/random-photo.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/random-photo.tcl,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/photo-album/www/random-photo.tcl	13 Feb 2004 08:37:48 -0000	1.4
+++ openacs-4/packages/photo-album/www/random-photo.tcl	23 Apr 2006 10:09:57 -0000	1.4.6.1
@@ -80,20 +80,20 @@
     set photo_clause ""
 }
 
-if {![info exists package_id]} {
-    if {[info exists photo_id]} {
-	# A photo ID was provided. Limit the query to that photo.
+if {[info exists photo_id]} {
+    # A photo ID was provided. Limit the query to that photo.
+    
+    set photo_clause [db_map photo_clause]
+}
 
-	set photo_clause [db_map photo_clause]
-    }
-
-    if {[catch {db_1row get_random_photo_all {}} err_msg]} {
-	ns_log error "No random photo found: $err_msg"
-	set found_p 0
-    } else {
-	set found_p 1
-    }
+if {[catch {db_1row get_random_photo_all {}} err_msg]} {
+    ns_log error "No random photo found: $err_msg"
+    set found_p 0
 } else {
+    set found_p 1
+}
+
+if {[info exists package_id] && $found_p == 0} {
     set root_folder_id [pa_get_root_folder $package_id]
     if {[catch {db_1row get_random_photo_folder {}} err_msg]} {
 	ns_log error "No random photo found in folder $root_folder_id: $err_msg"