Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	10 Jan 2007 21:22:11 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	27 Nov 2007 17:00:11 -0000	1.5
@@ -26,28 +26,18 @@
 
 ad_require_permission $user_id "write"
 
-if {![db_0or1row user_info "select 
-  first_names, 
-  last_name
-from persons
-where person_id = :user_id"]} {
+if {![db_0or1row user_info {}]} {
     ad_return_error "Account Unavailable" "We can't find you (user #$user_id) in the users table.  Probably your account was deleted for some reason."
     return
 }
 
-if {![db_0or1row portrait_info "
-select description
-from cr_revisions
-where revision_id = (select live_revision
-                     from cr_items c, acs_rels a
-                     where c.item_id = a.object_id_two
-                     and a.object_id_one = :user_id
-                     and a.rel_type = 'user_portrait_rel')"]} {
+if {![db_0or1row portrait_info {}]} {
     ad_return_complaint 1 "<li>You shouldn't have gotten here; we don't have a portrait on file for you."
     return
 }
 
 db_release_unused_handles
 
-set context [list [list "./" "Your Portrait"] "Edit comment"]
+set context [list [list "./" [_ acs-subsite.Your_Portrait]] [_ acs-subsite.edit_comment]]
 set export_vars [export_form_vars user_id return_url]
+
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/Attic/comment-edit.xql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.xql	27 Nov 2007 17:00:12 -0000	1.1
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE queryset PUBLIC "-//OpenACS//DTD XQL 1.0//EN" "http://www.thecodemill.biz/repository/xql.dtd">
+<!-- packages/acs-subsite/www/user/portrait/comment-edit.xql -->
+<!-- @author Emmanuelle Raffenne (eraffenne@dia.uned.es) -->
+<!-- @creation-date 2007-11-27 -->
+<!-- @arch-tag: d51369f7-896b-494e-8f83-92366f1a5349 -->
+<!-- @cvs-id $Id: comment-edit.xql,v 1.1 2007/11/27 17:00:12 emmar Exp $ -->
+
+<queryset>
+
+  <fullquery name="user_info">
+    <querytext>
+      select first_names, last_name
+      from persons
+      where person_id = :user_id
+    </querytext>
+  </fullquery>
+
+
+  <fullquery name="portrait_info">
+    <querytext>
+      select description
+      from cr_revisions
+      where revision_id = (select live_revision
+      from cr_items c, acs_rels a
+      where c.item_id = a.object_id_two
+      and a.object_id_one = :user_id
+      and a.rel_type = 'user_portrait_rel')
+    </querytext>
+  </fullquery>
+
+</queryset>
\ No newline at end of file