- joined b3-0-0-patches

catalog/acs-subsite.de_DE.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.1.4" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.1.5" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="_or"> oder</msg>
   <msg key="_Update_Basic_Information">Die Allgemeinen Informationen aktualisieren</msg>

catalog/acs-subsite.en_US.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.1.4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.1.5" locale="en_US" charset="ISO-8859-1">
 
   <msg key="_or">, or</msg>
   <msg key="_Update_Basic_Information">Update Basic Information</msg>

catalog/acs-subsite.es_ES.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.1.4" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.1.5" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="_or">, o</msg>
   <msg key="_Update_Basic_Information">Actualizar Informacin Bsica</msg>

catalog/acs-subsite.pt_BR.ISO-8859-1.xml

 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-subsite" package_version="5.1.2" locale="pt_BR" charset="ISO-8859-1">
+<message_catalog package_key="acs-subsite" package_version="5.1.5" locale="pt_BR" charset="ISO-8859-1">
 
   <msg key="_or">, ou</msg>
   <msg key="_Update_Basic_Information">Atualizar Informaes Bsicas</msg>

lib/login.adp

@@ -12,10 +12,9 @@
 
 <if @self_registration@ true>
 
-<p />
 <if @register_url@ not nil>
   <a href="@register_url@">#acs-subsite.Register#</a>
 </if>
 
 </if>
-</div>-
\ No newline at end of file
+</div>
\ No newline at end of file

lib/user-new.tcl

@@ -91,7 +91,7 @@ ad_form -extend -name register -on_request {
         }
     }
 
-    # Fraber 051124: TSearch2: We need to update "persons"
+    # Fraber 051124: TSearch2: We need to update "persons" 
     # in order to trigger the TSearch2  # triggers
     db_dml update_persons "
         update persons

www/admin/subsite-add.adp

-<master>
-  <property name="title">@page_title@</property>
-  <property name="context">@context@</property>
-  <property name="focus">subsite.instance_name</property>
-
-<formtemplate id="subsite"></formtemplate>
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
+  <property name="focus">subsite.instance_name</property>
+
+<formtemplate id="subsite"></formtemplate>

www/members/user-batch-add-2.tcl

@@ -160,13 +160,8 @@ while {[regexp {(.[^\n]+)} $userlist match_fodder row] } {
 	    regsub -all "<$key>" $sub_message $value sub_message
 	}
     
-	if {[catch {ns_sendmail "$email" "$from" "$subject" "$sub_message"} errmsg]} {
-	    ad_return_error "Mail Failed" "The system was unable to send email.  Please notify the user personally.  This problem is probably caused by a misconfiguration of your email system.  Here is the error: 
-<blockquote><pre>
-[ad_quotehtml $errmsg]
-</pre></blockquote>"
-            return
-        }
+    if {[catch {ns_sendmail "$email" "$from" "$subject" "$sub_message"} errmsg]} {
+
     }
 }
 

www/register/account-closed.tcl

@@ -6,6 +6,6 @@ ad_page_contract {
     {message:allhtml ""}
 }
 
-set page_title [ad_convert_to_text -html_p t -- $message]
+set page_title "Registration"
 set context [list $page_title]