From acb4b71ce55f3d98f7053b7bb8fdcf3c7858fbfc Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 11 Jun 2013 12:08:44 +0200
Subject: Fix error when there's no writeable addressbook source (#1489162)

Conflicts:

	CHANGELOG
---
 program/include/rcmail.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'program/include')

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index c35c24f8c..19a89b84c 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -228,6 +228,11 @@ class rcmail extends rcube
     }
 
     if (!$contacts) {
+      // there's no default, just return
+      if ($default) {
+        return null;
+      }
+
       self::raise_error(array(
         'code' => 700, 'type' => 'php',
         'file' => __FILE__, 'line' => __LINE__,
-- 
cgit v1.2.3