Merge pull request #30 from stoecker/master

Don't use data from non-existing identity to work with custom_from plugin

Author: deflomu

identity_smtp.php

@@ -238,7 +238,7 @@ function smtpWillConnect($args)
         $smtpSettings = $this->loadSmtpSettings(array(
             'identity_id' => $this->from_identity
         ));
-        if (!$smtpSettings['smtp_standard'] && !is_null($smtpSettings['smtp_standard'])) {
+        if (!is_null($this->from_identity) && !$smtpSettings['smtp_standard'] && !is_null($smtpSettings['smtp_standard'])) {
             $args['smtp_host']   = $smtpSettings['smtp_host'];
             $args['smtp_user']   = $smtpSettings['smtp_user'];
             $args['smtp_pass']   = rcmail::get_instance()->decrypt($smtpSettings['smtp_pass']);