From 70c31118264e447699d4ed628f45b7853799423d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 27 Jul 2011 09:42:15 -0400
Subject: [PATCH] - Fix fallback to default source (#1488009)
---
program/steps/addressbook/func.inc | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index b74b45f..6635d13 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -100,7 +100,7 @@
}
// instantiate a contacts object according to the given source
-function rcmail_contact_source($source=null, $init_env=false)
+function rcmail_contact_source($source=null, $init_env=false, $writable=false)
{
global $RCMAIL, $OUTPUT, $CONFIG, $CONTACT_COLTYPES;
@@ -108,12 +108,8 @@
$source = get_input_value('_source', RCUBE_INPUT_GPC);
}
- if (!strlen($source)) {
- return null;
- }
-
// Get object
- $CONTACTS = $RCMAIL->get_address_book($source);
+ $CONTACTS = $RCMAIL->get_address_book($source, $writable);
$CONTACTS->set_pagesize($CONFIG['pagesize']);
// set list properties and session vars
@@ -163,7 +159,7 @@
function rcmail_set_sourcename($abook)
{
global $OUTPUT;
-
+
// get address book name (for display)
if ($abook && $_SESSION['addressbooks_count'] > 1) {
$name = $abook->get_name();
--
Gitblit v1.9.1