Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.43.2.16 -r1.43.2.17
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	18 May 2006 19:24:28 -0000	1.43.2.16
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	20 May 2006 21:52:17 -0000	1.43.2.17
@@ -182,6 +182,7 @@
   <msg key="Edit">Edit</msg>
   <msg key="Edit_a_User">Edit a User</msg>
   <msg key="edit_approved_email_servers">Edit Pre-approved Email Servers</msg>
+  <msg key="Edit_Biography">Edit Biography</msg>
   <msg key="edit_community_parameters">Edit community parameters</msg>
   <msg key="edit_message_and_hit_send">Edit the message below and hit &quot;Send Email&quot; to
 notify this user.</msg>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/bio.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/bio.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.4 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/facilitator-bio.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.5 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/facilitator-bio.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/bio-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/bio-update.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/dotlrn/www/bio-update.adp	31 May 2005 23:13:06 -0000	1.1.2.1
+++ openacs-4/packages/dotlrn/www/bio-update.adp	20 May 2006 21:52:18 -0000	1.1.2.2
@@ -2,6 +2,4 @@
   <property name="title">@page_title@</property>
   <property name="context">@context;noquote@</property>
 
-<h3>Add a Facilitator Bio</h3>
-<br /><br />
 <formtemplate id="user_info" style="bio-update"></formtemplate>
Index: openacs-4/packages/dotlrn/www/bio-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/bio-update.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/dotlrn/www/bio-update.tcl	6 Sep 2005 09:58:21 -0000	1.1.2.2
+++ openacs-4/packages/dotlrn/www/bio-update.tcl	20 May 2006 21:52:18 -0000	1.1.2.3
@@ -13,7 +13,7 @@
 # HAM : 090705 user must be logged in to view this page
 auth::require_login
 
-set page_title [_ dotlrn._Update_Bio]
+set page_title [_ dotlrn.Edit_Bio]
 
 if {[empty_string_p $user_id]} {
     set user_id [ad_conn user_id]
@@ -135,7 +135,6 @@
 
     if {![empty_string_p $upload_file]} {
         set tmp_filename [template::util::file::get_property tmp_filename $upload_file]
-
         set file_extension [string tolower [file extension $upload_file]]
 
         # remove the first . from the file extension
@@ -191,9 +190,14 @@
                 }
             }
 
-            set convert_path [parameter::get -parameter ConvertBinPath -package_id [dotlrn::get_package_id] -default "/bin/convert"]
-            exec $convert_path -scale 135 $tmp_filename $tmp_filename
+            set convert_path [parameter::get -parameter ConvertBinPath -package_id [dotlrn::get_package_id] -default "/usr/local/bin/convert"]
 
+            if { [file exists $convert_path] } {
+                if { [catch {exec $convert_path -type [lindex [split $guessed_file_type /] 1] -scale 135 $tmp_filename $tmp_filename} errmsg] } {
+                    ns_log Warning "\"convert\" failed with the following error: $errmsg"
+                }
+            }
+
             set revision_id [cr_import_content \
                                  -image_only \
                                  -item_id $item_id \
@@ -206,7 +210,7 @@
                                  $guessed_file_type \
                                  portrait-of-user-$user_id]
             
-            cr_set_imported_content_live $guessed_file_type $revision_id
+            item::publish -item_id $item_id -revision_id $revision_id
             
         }
     } else {
Index: openacs-4/packages/dotlrn/www/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v
diff -u -r1.22.2.2 -r1.22.2.3
--- openacs-4/packages/dotlrn/www/community-member.adp	16 Sep 2005 15:41:22 -0000	1.22.2.2
+++ openacs-4/packages/dotlrn/www/community-member.adp	20 May 2006 21:52:18 -0000	1.22.2.3
@@ -75,4 +75,4 @@
   </if>
 </if>
 
-<include src="/packages/dotlrn/lib/facilitator-bio" user_id="@user_id@" community_id="@community_id@" return_url="@return_url_2;noquote@">
+<include src="/packages/dotlrn/lib/bio" user_id="@user_id@" community_id="@community_id@" return_url="@return_url_2;noquote@">
Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/facilitator-bio.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.4 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/facilitator-bio.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?