Fixing minor corrections when migrating from 1.8.7 to 1.9 see #4662

main/inc/conf/mail.conf.dist.php

@@ -8,7 +8,7 @@
  */
 
 $platform_email['SMTP_FROM_EMAIL']   = (isset($administrator['email'])?$administrator['email']:'admin@example.com');
-$platform_email['SMTP_FROM_NAME']    = (isset($administrator['name'])?$administrator['name']:'John Doe');
+$platform_email['SMTP_FROM_NAME']    = (isset($administrator['name'])?$administrator['name']:'Admin');
 $platform_email['SMTP_HOST']         = 'localhost';
 $platform_email['SMTP_PORT']         = 25;
 $platform_email['SMTP_MAILER']       = IS_WINDOWS_OS ? 'smtp' : 'mail'; // mail, sendmail or smtp

main/inc/global.inc.php

@@ -307,6 +307,11 @@ $this_section = SECTION_GLOBAL;
 require $includePath.'/local.inc.php';
 
 //Include Chamilo Mail conf this is added here because the api_get_setting works
+
+//Fixes bug in Chamilo 1.8.7.1 array was not set
+$administrator['email'] = isset($administrator['email']) ? $administrator['email'] : 'admin@example.com';
+$administrator['name']  = isset($administrator['name']) ? $administrator['name'] : 'Admin';
+ 
 $mail_conf = api_get_path(CONFIGURATION_PATH).'mail.conf.php';
 if (file_exists($mail_conf)) {
 	require_once $mail_conf; 

main/inc/lib/database.lib.php

@@ -816,9 +816,9 @@ class Database {
                     }
                 } else {
                     if (!empty($class) && !empty($function)) {
-                        $info .= 'CLASS: ' . $class;
+                        $info = 'CLASS: ' . $class;
                         error_log($info);
-                        $info .= 'METHOD: ' . $function;
+                        $info = 'METHOD: ' . $function;
                         error_log($info);
                     }
                 }