Merge branch 'ilosada-7225chamilo' into 1.9.x

main/inc/ajax/user_manager.ajax.php

@@ -82,7 +82,6 @@ switch ($action) {
 
                 //Send and email if account is active
                 if ($status == 1) {
-
                     $user_info = api_get_user_info($user_id);
                     $recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
                     $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');

main/user/user_add.php

@@ -210,20 +210,18 @@ if($register) {
         );
 
         api_mail_html(
-          $recipient_name,
+            $recipient_name,
-          $email_form,
+            $email_form,
-          $emailsubject,
+            $emailsubject,
-          $emailbody,
+            $emailbody,
-          $sender_name,
+            $sender_name,
-          $email_admin,
+            $email_admin,
-          null,
+            null,
-          null,
+            null,
-          null,
+            null,
-          $additionalParameters
+            $additionalParameters
         );
 
-        //@api_mail($recipient_name, $email_form, $emailsubject, $emailbody, $sender_name,$email_admin);
-
         /*
          * remove <form> variables to prevent any pre-filled fields
          */