DataObjects/Core_domain.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 7ccbc2a..596ff9c 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -310,8 +310,9 @@ class Pman_Core_Mailer {
     }
     function send($email = false)
     {
+        $ff = HTML_FlexyFramework::get();
         
-        $pg = HTML_FlexyFramework::get()->page;
+        $pg = $ff->page;
         
         
         $email = is_array($email)  ? $email : $this->toData();
@@ -325,7 +326,9 @@ class Pman_Core_Mailer {
         //$this->log( htmlspecialchars(print_r($email,true)));
         
         ///$recipents = array($this->email);
-        $mailOptions = PEAR::getStaticProperty('Mail','options');
+//        $mailOptions = PEAR::getStaticProperty('Mail','options');
+        
+        $mailOptions = isset($ff->Mail) ? $ff->Mail : array();
         //print_R($mailOptions);exit;
         
         if ($this->mail_method == 'SMTPMX' && empty($mailOptions['mailname'])) {