[Fmsystem-commits] [17287] felamimail: avoid exception

[sigurdne]

Revision: 17287
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17287
Author:   sigurdne
Date:     2017-11-08 09:46:20 -0500 (Wed, 08 Nov 2017)
Log Message:
-----------
felamimail: avoid exception

Modified Paths:
--------------
    trunk/felamimail/inc/class.bofelamimail.inc.php

Modified: trunk/felamimail/inc/class.bofelamimail.inc.php
===================================================================
--- trunk/felamimail/inc/class.bofelamimail.inc.php     2017-11-08 13:45:46 UTC 
(rev 17286)
+++ trunk/felamimail/inc/class.bofelamimail.inc.php     2017-11-08 14:46:20 UTC 
(rev 17287)
@@ -72,8 +72,11 @@
 
                        $this->mailPreferences  = 
$this->bopreferences->getPreferences();
 
-                       $this->icServer = 
$this->mailPreferences->getIncomingServer(0);
-                       $this->ogServer = 
$this->mailPreferences->getOutgoingServer(0);
+                       if(is_object($this->mailPreferences))
+                       {
+                               $this->icServer = 
$this->mailPreferences->getIncomingServer(0);
+                               $this->ogServer = 
$this->mailPreferences->getOutgoingServer(0);
+                       }
 
                        #_debug_array($this->mailPreferences);
                        $this->imapBaseDir      = '';
@@ -2290,6 +2293,10 @@
 
                function updateAccount($_hookValues) 
                {
+                       if(!is_object($this->mailPreferences))
+                       {
+                               return;
+                       }
                        $icServer = 
$this->mailPreferences->getIncomingServer(0);
                        if(is_a($icServer,'defaultimap')) {
                                $icServer->updateAccount($_hookValues);