Index: openacs-4/packages/general-comments/general-comments.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/general-comments.info,v
diff -u -r1.17.2.5 -r1.17.2.6
--- openacs-4/packages/general-comments/general-comments.info	1 Dec 2015 13:56:11 -0000	1.17.2.5
+++ openacs-4/packages/general-comments/general-comments.info	21 May 2016 10:15:38 -0000	1.17.2.6
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>comments</auto-mount>
 
-    <version name="5.9.0" url="http://openacs.org/repository/download/apm/general-comments-5.9.0.apm">
+    <version name="5.9.1d1" url="http://openacs.org/repository/download/apm/general-comments-5.9.1d1.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
         <summary>Service to provide comment entry and display on objects.</summary>
@@ -18,10 +18,10 @@
         <license>GPL</license>
         <maturity>2</maturity>
 
-        <provides url="general-comments" version="5.9.0"/>
+        <provides url="general-comments" version="5.9.1d1"/>
 	<requires url="acs-kernel" version="5.9.0"/>
         <requires url="acs-content-repository" version="5.9.0"/>
-        
+        <requires url="acs-tcl" version="5.9.1d7"/>
         <requires url="acs-messaging" version="5.9.0"/>
 
         <callbacks>
Index: openacs-4/packages/general-comments/www/comment-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add-2.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/general-comments/www/comment-add-2.tcl	12 Sep 2015 11:06:33 -0000	1.7.2.1
+++ openacs-4/packages/general-comments/www/comment-add-2.tcl	21 May 2016 10:15:38 -0000	1.7.2.2
@@ -15,7 +15,7 @@
     comment_mime_type:notnull
     { context_id:naturalnum "$object_id" }
     { category {} }
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/comment-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add-3.tcl,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/general-comments/www/comment-add-3.tcl	12 Sep 2015 11:06:33 -0000	1.12.2.1
+++ openacs-4/packages/general-comments/www/comment-add-3.tcl	21 May 2016 10:15:38 -0000	1.12.2.2
@@ -15,7 +15,7 @@
     comment_mime_type
     { context_id:naturalnum "$object_id" }
     { category "" }
-    { return_url "" }
+    { return_url:localurl "" }
     { attach_p:boolean "f" }
 }    
 
Index: openacs-4/packages/general-comments/www/comment-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-add.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/general-comments/www/comment-add.tcl	12 Sep 2015 11:06:33 -0000	1.6.2.1
+++ openacs-4/packages/general-comments/www/comment-add.tcl	21 May 2016 10:15:38 -0000	1.6.2.2
@@ -12,7 +12,7 @@
     { object_name "[acs_object_name $object_id]" }
     { context_id:naturalnum "$object_id" }
     { category "" }
-    { return_url "" }
+    { return_url:localurl "" }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/comment-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit-2.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/general-comments/www/comment-edit-2.tcl	12 Sep 2015 11:06:34 -0000	1.7.2.1
+++ openacs-4/packages/general-comments/www/comment-edit-2.tcl	21 May 2016 10:15:38 -0000	1.7.2.2
@@ -19,7 +19,7 @@
     title:notnull
     content:notnull,html
     comment_mime_type
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/comment-edit-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit-3.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/general-comments/www/comment-edit-3.tcl	12 Sep 2015 11:06:34 -0000	1.6.2.1
+++ openacs-4/packages/general-comments/www/comment-edit-3.tcl	21 May 2016 10:15:38 -0000	1.6.2.2
@@ -12,7 +12,7 @@
     title
     content:html
     comment_mime_type
-    { return_url {} }
+    { return_url:localurl {} }
 }
 
 # check to see if the user can edit this comment
Index: openacs-4/packages/general-comments/www/comment-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/general-comments/www/comment-edit.tcl	12 Sep 2015 11:06:34 -0000	1.6.2.1
+++ openacs-4/packages/general-comments/www/comment-edit.tcl	21 May 2016 10:15:38 -0000	1.6.2.2
@@ -12,7 +12,7 @@
 } { 
     comment_id:naturalnum,notnull
     { revision_id:naturalnum {} }
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-2.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/general-comments/www/delete-2.tcl	12 Sep 2015 11:06:34 -0000	1.4.2.1
+++ openacs-4/packages/general-comments/www/delete-2.tcl	21 May 2016 10:15:38 -0000	1.4.2.2
@@ -11,7 +11,7 @@
     @cvs-id $Id$
 } {
     comment_id:naturalnum,notnull
-    { return_url {} }
+    { return_url:localurl {} }
 }
 
 # There is a bug in content_item.delete that results in
Index: openacs-4/packages/general-comments/www/delete-attachment-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment-2.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/general-comments/www/delete-attachment-2.tcl	12 Sep 2015 11:06:34 -0000	1.7.2.1
+++ openacs-4/packages/general-comments/www/delete-attachment-2.tcl	21 May 2016 10:15:38 -0000	1.7.2.2
@@ -15,7 +15,7 @@
     attach_id:naturalnum,notnull
     parent_id:naturalnum,notnull
     submit:notnull
-    { return_url {} }
+    { return_url:localurl {} }
 }
 
 # check for permissions
Index: openacs-4/packages/general-comments/www/delete-attachment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/general-comments/www/delete-attachment.tcl	12 Sep 2015 11:06:34 -0000	1.6.2.1
+++ openacs-4/packages/general-comments/www/delete-attachment.tcl	21 May 2016 10:15:38 -0000	1.6.2.2
@@ -13,7 +13,7 @@
 } {
     attach_id:naturalnum,notnull
     parent_id:naturalnum,notnull
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/general-comments/www/delete.tcl	12 Sep 2015 11:06:34 -0000	1.3.2.1
+++ openacs-4/packages/general-comments/www/delete.tcl	21 May 2016 10:15:38 -0000	1.3.2.2
@@ -11,7 +11,7 @@
     @cvs-id $Id$
 } {
     comment_id:naturalnum,notnull
-    { return_url {}}
+    { return_url:localurl {}}
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/file-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-add-2.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/general-comments/www/file-add-2.tcl	12 Sep 2015 11:06:34 -0000	1.8.2.1
+++ openacs-4/packages/general-comments/www/file-add-2.tcl	21 May 2016 10:15:38 -0000	1.8.2.2
@@ -18,7 +18,7 @@
     title:notnull
     upload_file:notnull
     upload_file.tmpfile:tmpfile
-    { return_url {} }
+    { return_url:localurl {} }
 } -validate {
     allow_file_attachments {
         set allow_files_p [parameter::get -parameter AllowFileAttachmentsP -default {t}]
Index: openacs-4/packages/general-comments/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-add.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/general-comments/www/file-add.tcl	12 Sep 2015 11:06:35 -0000	1.5.2.1
+++ openacs-4/packages/general-comments/www/file-add.tcl	21 May 2016 10:15:38 -0000	1.5.2.2
@@ -11,7 +11,7 @@
     @cvs-id $Id$
 } {
     parent_id:notnull,naturalnum
-    {return_url {} }
+    {return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/file-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-edit-2.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/general-comments/www/file-edit-2.tcl	12 Sep 2015 11:06:35 -0000	1.4.2.1
+++ openacs-4/packages/general-comments/www/file-edit-2.tcl	21 May 2016 10:15:38 -0000	1.4.2.2
@@ -15,7 +15,7 @@
     attach_id:naturalnum,notnull
     parent_id:naturalnum,notnull
     title:notnull
-    { return_url {} }
+    { return_url:localurl {} }
 }
 
 # check to see if the user can edit this comment
Index: openacs-4/packages/general-comments/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-edit.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/general-comments/www/file-edit.tcl	12 Sep 2015 11:06:35 -0000	1.5.2.1
+++ openacs-4/packages/general-comments/www/file-edit.tcl	21 May 2016 10:15:38 -0000	1.5.2.2
@@ -13,7 +13,7 @@
 } {
     attach_id:naturalnum,notnull
     parent_id:naturalnum,notnull
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/url-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-add-2.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/general-comments/www/url-add-2.tcl	12 Sep 2015 11:06:36 -0000	1.6.2.1
+++ openacs-4/packages/general-comments/www/url-add-2.tcl	21 May 2016 10:15:38 -0000	1.6.2.2
@@ -12,7 +12,7 @@
     parent_id:naturalnum,notnull
     label:notnull
     url:notnull
-    { return_url {} }
+    { return_url:localurl {} }
 } -validate {
     allow_link_attachments {
         set allow_links_p [parameter::get -parameter AllowLinkAttachmentsP -default {t}]
Index: openacs-4/packages/general-comments/www/url-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-add.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/general-comments/www/url-add.tcl	12 Sep 2015 11:06:36 -0000	1.5.2.1
+++ openacs-4/packages/general-comments/www/url-add.tcl	21 May 2016 10:15:38 -0000	1.5.2.2
@@ -11,7 +11,7 @@
     @cvs-id $Id$
 } {
     parent_id:notnull,naturalnum
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/url-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-edit-2.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/general-comments/www/url-edit-2.tcl	12 Sep 2015 11:06:36 -0000	1.5.2.1
+++ openacs-4/packages/general-comments/www/url-edit-2.tcl	21 May 2016 10:15:38 -0000	1.5.2.2
@@ -12,7 +12,7 @@
     parent_id:naturalnum,notnull
     label:notnull
     url:notnull
-    { return_url {} }
+    { return_url:localurl {} }
 }
 
 # authenticate the user
Index: openacs-4/packages/general-comments/www/url-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-edit.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/general-comments/www/url-edit.tcl	12 Sep 2015 11:06:36 -0000	1.5.2.1
+++ openacs-4/packages/general-comments/www/url-edit.tcl	21 May 2016 10:15:38 -0000	1.5.2.2
@@ -10,7 +10,7 @@
 } {
     attach_id:naturalnum,notnull
     parent_id:naturalnum,notnull
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/view-comment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/general-comments/www/view-comment.tcl	12 Sep 2015 11:06:37 -0000	1.10.2.1
+++ openacs-4/packages/general-comments/www/view-comment.tcl	21 May 2016 10:15:38 -0000	1.10.2.2
@@ -11,7 +11,7 @@
     comment_id:naturalnum,notnull
     { revision_id:naturalnum,optional {} }
     { object_name {} }
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/view-image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-image.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/general-comments/www/view-image.tcl	12 Sep 2015 11:06:37 -0000	1.5.2.1
+++ openacs-4/packages/general-comments/www/view-image.tcl	21 May 2016 10:15:38 -0000	1.5.2.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 } {
     image_id:naturalnum,notnull
-    { return_url {} }
+    { return_url:localurl {} }
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/admin/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete-2.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/general-comments/www/admin/delete-2.tcl	12 Sep 2015 11:06:37 -0000	1.4.2.1
+++ openacs-4/packages/general-comments/www/admin/delete-2.tcl	21 May 2016 10:15:38 -0000	1.4.2.2
@@ -11,7 +11,7 @@
     @cvs-id $Id$
 } {
     comment_id:naturalnum,notnull
-    { return_url {} }
+    { return_url:localurl {} }
 }
 
 # There is a bug in content_item.delete that results in
Index: openacs-4/packages/general-comments/www/admin/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/general-comments/www/admin/delete.tcl	12 Sep 2015 11:06:37 -0000	1.5.2.1
+++ openacs-4/packages/general-comments/www/admin/delete.tcl	21 May 2016 10:15:38 -0000	1.5.2.2
@@ -11,7 +11,7 @@
     @cvs-id $Id$
 } {
     comment_id:naturalnum,notnull
-    { return_url {}}
+    { return_url:localurl {}}
 } -properties {
     page_title:onevalue
     context:onevalue
Index: openacs-4/packages/general-comments/www/admin/toggle-approval.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/toggle-approval.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/general-comments/www/admin/toggle-approval.tcl	12 Sep 2015 11:06:37 -0000	1.3.2.1
+++ openacs-4/packages/general-comments/www/admin/toggle-approval.tcl	21 May 2016 10:15:38 -0000	1.3.2.2
@@ -12,7 +12,7 @@
 } {
     comment_id:naturalnum,notnull
     {revision_id:naturalnum {}}
-    {return_url {}}
+    {return_url:localurl {}}
 }
 
 # get the live revision of the item for comparison
Index: openacs-4/packages/notifications/notifications.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/notifications.info,v
diff -u -r1.55.2.5 -r1.55.2.6
--- openacs-4/packages/notifications/notifications.info	1 Dec 2015 13:56:11 -0000	1.55.2.5
+++ openacs-4/packages/notifications/notifications.info	21 May 2016 10:18:18 -0000	1.55.2.6
@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>notifications</auto-mount>
 
-    <version name="5.9.0" url="http://openacs.org/repository/download/apm/notifications-5.9.0.apm">
+    <version name="5.9.1d1" url="http://openacs.org/repository/download/apm/notifications-5.9.1d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Email notifications management</summary>
         <release-date>2015-10-04</release-date>
@@ -17,9 +17,9 @@
         <maturity>3</maturity>
         <package_instance_name>#notifications.Notifications#</package_instance_name>
 
-        <provides url="notifications" version="5.9.0"/>
+        <provides url="notifications" version="5.9.1d1"/>
         <requires url="acs-kernel" version="5.9.0"/>
-	<requires url="acs-tcl" version="5.9.0"/>
+	<requires url="acs-tcl" version="5.9.1d7"/>
         <requires url="acs-mail-lite" version="5.9.0"/>
 
         <callbacks>
Index: openacs-4/packages/notifications/www/request-change-frequency.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-change-frequency.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/notifications/www/request-change-frequency.tcl	12 Sep 2015 11:06:47 -0000	1.4.2.1
+++ openacs-4/packages/notifications/www/request-change-frequency.tcl	21 May 2016 10:18:18 -0000	1.4.2.2
@@ -7,7 +7,7 @@
     @cvs-id $Id$
 } {
     request_id:naturalnum,notnull
-    return_url
+    return_url:localurl
 }
 
 set user_id [ad_conn user_id]
Index: openacs-4/packages/notifications/www/request-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-delete.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/notifications/www/request-delete.tcl	12 Sep 2015 11:06:48 -0000	1.4.2.1
+++ openacs-4/packages/notifications/www/request-delete.tcl	21 May 2016 10:18:18 -0000	1.4.2.2
@@ -8,7 +8,7 @@
     @cvs-id $Id$
 } {
     request_id:naturalnum,notnull
-    return_url
+    return_url:localurl
 }
 
 # Security Check
Index: openacs-4/packages/notifications/www/request-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new-2.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/notifications/www/request-new-2.tcl	12 Sep 2015 11:06:48 -0000	1.4.2.1
+++ openacs-4/packages/notifications/www/request-new-2.tcl	21 May 2016 10:18:18 -0000	1.4.2.2
@@ -9,7 +9,7 @@
 } {
     type_id:naturalnum,notnull
     object_id:naturalnum,notnull
-    return_url
+    return_url:localurl
 }
 
 set user_id [ad_conn user_id]
Index: openacs-4/packages/notifications/www/request-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.tcl,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/notifications/www/request-new.tcl	12 Sep 2015 11:06:48 -0000	1.12.2.1
+++ openacs-4/packages/notifications/www/request-new.tcl	21 May 2016 10:18:18 -0000	1.12.2.2
@@ -9,7 +9,7 @@
     type_id:naturalnum,notnull
     object_id:naturalnum,notnull
     {pretty_name ""}
-    return_url
+    return_url:localurl
 }
 
 set user_id [auth::require_login]
Index: openacs-4/packages/notifications/www/unsubscribe.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/unsubscribe.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/notifications/www/unsubscribe.tcl	12 Sep 2015 11:06:49 -0000	1.2.2.1
+++ openacs-4/packages/notifications/www/unsubscribe.tcl	21 May 2016 10:18:18 -0000	1.2.2.2
@@ -7,7 +7,7 @@
     object_id:naturalnum,notnull
     request_id:naturalnum,multiple
     type_id:naturalnum,notnull
-    return_url         
+    return_url:localurl         
 } 
 
 set request_count [llength $request_id]