Index: openacs-4/packages/new-portal/tcl/datasource-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/datasource-procs.tcl,v
diff -u -r1.4 -r1.4.18.1
--- openacs-4/packages/new-portal/tcl/datasource-procs.tcl	29 Jun 2003 23:30:49 -0000	1.4
+++ openacs-4/packages/new-portal/tcl/datasource-procs.tcl	6 Sep 2014 19:38:10 -0000	1.4.18.1
@@ -73,7 +73,7 @@
 
                 if { ![regexp {^([^ \t:]+)(?::([a-zA-Z0-9_,(|)]*))} \
                            $param match param_name flags] } {
-                    ad_return -code error "Parameter name '$param' doesn't have the right format. It must be var\[:flag\[,flag ...\]\]"
+                    return -code error "Parameter name '$param' doesn't have the right format. It must be var\[:flag\[,flag ...\]\]"
                 }
 
                 # set defaults for attributes
@@ -85,7 +85,7 @@
                     switch -exact $flag {
                         configured { set configured_p t }
                         config_required { set config_required_p t}
-                        default { ad_return -code error "\"$flag\" is not a legal portal datasource attribute" }
+                        default { return -code error "\"$flag\" is not a legal portal datasource attribute" }
                     }
                 }
 
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.191 -r1.191.2.1
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	1 Nov 2013 21:45:33 -0000	1.191
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	6 Sep 2014 19:38:10 -0000	1.191.2.1
@@ -268,7 +268,7 @@
     if {[db_0or1row portal_select {} -column_array portal]} {
         set page_id $portal(page_id)
     } else {
-        ad_return_complaint 1 "[_ new-portal.Page_not_found]"
+        return_complaint 1 [_ new-portal.Page_not_found]
         ad_script_abort
     }
 
@@ -900,7 +900,7 @@
     } elseif { [ns_set get $form "op_add_page"] ne "" } {
         set pretty_name [ns_set get $form pretty_name]
         if {$pretty_name eq ""} {
-            ad_return_complaint 1 "[_ new-portal.lt_You_must_enter_new_na]"
+            ad_return_complaint 1 [_ new-portal.lt_You_must_enter_new_na]
         }
         page_create -pretty_name $pretty_name -portal_id $portal_id
     } elseif { [ns_set get $form "op_remove_empty_page"] ne "" } {
@@ -916,7 +916,7 @@
         set page_id [ns_set get $form page_id]
 
         if {$pretty_name eq ""} {
-            ad_return_complaint 1 "[_ new-portal.lt_You_must_enter_new_na]"
+            ad_return_complaint 1 [_ new-portal.lt_You_must_enter_new_na]
         }
         set_page_pretty_name -pretty_name $pretty_name -page_id $page_id
     } elseif { [ns_set get $form "op_toggle_tab_visibility"] ne "" } {
@@ -1768,7 +1768,7 @@
               errmsg ] } {
         global errorInfo
         ns_log error "*** portal::evaluate_element_raw callback Error ! ***\n\n $errmsg\n\n$errorInfo\n\n"
-        ad_return -error
+        #ad_return -error
         ad_return_complaint 1 "*** portal::evaluate_element_raw show callback Error! *** <P> $errmsg\n\n"
 
     }