From caf2e1e7f3c9435304422c432b6b400d4dad1d9e Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Tue, 3 Mar 2009 21:56:52 +0000 Subject: [PATCH] Ignore if the database file is missing. --- .../Kolab_Server/lib/Horde/Kolab/Server/file.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/file.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/file.php index 25309438b..132c0665b 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/file.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/file.php @@ -60,15 +60,17 @@ class Horde_Kolab_Server_file extends Horde_Kolab_Server_test protected function load() { $raw_data = file_get_contents($this->_file); - $data = @unserialize($raw_data); - if ($data !== false) { - $this->_data = $data; - } else { - $error = error_get_last(); - Horde::logMessage(sprintf('Horde_Kolab_Server_file failed to read the database from %s. Error was: %s', - $this->_file, $error['message']), __FILE__, - __LINE__, PEAR_LOG_WARNING); - $this->_data = array(); + if (!$raw_daata === false) { + $data = @unserialize($raw_data); + if ($data !== false) { + $this->_data = $data; + } else { + $error = error_get_last(); + Horde::logMessage(sprintf('Horde_Kolab_Server_file failed to read the database from %s. Error was: %s', + $this->_file, $error['message']), __FILE__, + __LINE__, PEAR_LOG_WARNING); + $this->_data = array(); + } } } -- 2.11.0