Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/acs-subsite/www/shared/community-member.adp	22 Aug 2015 10:08:51 -0000	1.18.2.1
+++ openacs-4/packages/acs-subsite/www/shared/community-member.adp	14 Dec 2015 18:06:17 -0000	1.18.2.2
@@ -5,13 +5,14 @@
 
 <if @inline_portrait_state@ eq "inline">
       <div style="float:right">
-        <a href="portrait?@portrait_export_vars@"><img src="portrait-bits?@portrait_export_vars@" width="@width@" height="@height@" alt="Portrait of @first_names@ @last_name@"></a>
+        <a href="@portrait_url;noi18n@"><img src="@portrait_image_url;noi18n@"
+	width="@width@" height="@height@" alt="Portrait of @first_names@ @last_name@"></a>
       </div>
 </if>
 <else>
   <if @inline_portrait_state@ eq "link">
     <ul class="action-links">
-      <li><a href="portrait?@portrait_export_vars@">#acs-subsite.Portrait#</a></li>
+      <li><a href="@portrait_url;noi18n@">#acs-subsite.Portrait#</a></li>
     </ul>
   </if>
 </else>
Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v
diff -u -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/acs-subsite/www/shared/community-member.tcl	10 Sep 2015 08:21:52 -0000	1.21.2.1
+++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl	14 Dec 2015 18:06:18 -0000	1.21.2.2
@@ -12,7 +12,8 @@
     last_name:onevalue
     email:onevalue
     inline_portrait_state:onevalue
-    portrait_export_vars:onevalue
+    portrait_url:onevalue
+    portrait_image_url:onevalue
     width:onevalue
     height:onevalue
     system_name:onevalue
@@ -73,7 +74,8 @@
 
 # Do we show the portrait?
 set inline_portrait_state "none"
-set portrait_export_vars [export_vars {user_id}]
+set portrait_url [export_vars -base portrait {user_id}]
+set portrait_image_url [export_vars -base portrait-bits {user_id}]
 
 if {[db_0or1row portrait_info "
 select i.width, i.height, cr.title, cr.description, cr.publish_date
Index: openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl	10 Sep 2015 08:21:53 -0000	1.10.2.1
+++ openacs-4/packages/acs-subsite/www/shared/portrait-bits.tcl	14 Dec 2015 18:06:18 -0000	1.10.2.2
@@ -6,23 +6,14 @@
     @cvs-id $Id$
 } {
     user_id:naturalnum,notnull
-    {item_id:naturalnum ""}
     {size ""}
 }
 
+set item_id [acs_user::get_portrait_id -user_id $user_id]
 
-# If the item_id is provided then we are fine
-if {$item_id eq ""} {
-    if { ![db_0or1row get_item_id ""] } {
-	#    ad_return_error "Couldn't find portrait" "Couldn't find a portrait for User $user_id"
-	#ad_return_string_as_file -string "" -mime_type "image/jpeg" -filename ""
-	return
-    }
-}    
-
 if { $size eq "" } {
     cr_write_content -item_id $item_id
-} else {	
+} else {
     ad_returnredirect "/image/${item_id}/${size}"
 }
 
Index: openacs-4/packages/acs-subsite/www/shared/portrait.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.adp,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-subsite/www/shared/portrait.adp	3 Jul 2015 10:25:50 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/shared/portrait.adp	14 Dec 2015 18:06:18 -0000	1.9.2.1
@@ -3,7 +3,7 @@
 <property name="context">@context;literal@</property>
 
 <div style="padding: 1em; text-align: center;">
-  <img @widthheight_param@ src="@subsite_url@shared/portrait-bits.tcl?@export_vars@" alt="#acs-subsite.lt_Portrait_of_first_last#">
+  <img @widthheight_param@ src="@portrait_image_url;noi18n@" alt="#acs-subsite.lt_Portrait_of_first_last#">
   <if @description@ ne "">
     <p>@description@</p>
   </if>
Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/acs-subsite/www/shared/portrait.tcl	10 Sep 2015 08:21:53 -0000	1.10.2.1
+++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl	14 Dec 2015 18:06:18 -0000	1.10.2.2
@@ -42,7 +42,7 @@
 
 set doc(title) [_ acs-subsite.lt_Portrait_of_first_last]
 set context [list [list [acs_community_member_url -user_id $user_id] "$first_names $last_name"] [_ acs-subsite.Portrait]]
-set export_vars [export_vars {user_id}]
+set portrait_image_url [export_vars -base ${subsite_url}shared/portrait-bits.tcl {user_id}]
 set pretty_date [lc_time_fmt $publish_date "%q"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	3 Jul 2015 10:25:50 -0000	1.13
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	14 Dec 2015 18:06:18 -0000	1.13.2.1
@@ -10,7 +10,7 @@
 </if>
 
 <div style="text-align:center">
-<img @widthheight@ src="@subsite_url@shared/portrait-bits.tcl?@export_vars@" alt="@doc.title@">
+<img @widthheight@ src="@portrait_image_url;noi18n@" alt="@doc.title@">
 </div>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	10 Sep 2015 08:21:54 -0000	1.12.2.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	14 Dec 2015 18:06:18 -0000	1.12.2.2
@@ -45,8 +45,8 @@
     set admin_p 0
 }
 
-set export_vars      [export_vars {user_id}]
-set export_edit_vars [export_vars {user_id return_url}]
+set portrait_image_url [export_vars -base ${subsite_url}shared/portrait-bits.tcl {user_id}]
+set export_edit_vars   [export_vars {user_id return_url}]
 
 if {![db_0or1row user_info "select 
   first_names,