Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.197 -r1.198
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	27 Dec 2011 14:19:55 -0000	1.197
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	28 Dec 2011 18:08:36 -0000	1.198
@@ -621,9 +621,18 @@
     my instvar object
 
     array set "" [$object item_ref -default_lang [$object lang] -parent_id $parent_id $entry_name]
+
+    set label [my label] ;# the label is used for alt und title
+    if {$label eq $(stripped_name)} {
+      # The label is apparently the default. For Photo.form instances,
+      # this is always "image". In such cases, use the title of the
+      # parent object as label.
+      set label [[my object] title]
+    }
+    
     set l [::xowiki::Link create new -destroy_on_cleanup \
 	       -page $object -type "image" -lang $(prefix) \
-	       [list -stripped_name $(stripped_name)] [list -label [my label]] \
+	       [list -stripped_name $(stripped_name)] [list -label $label] \
 	       -parent_id $(parent_id) -item_id $(item_id)]
 
     foreach option {