From 87a2f686f0c0477a33ffe563321cc3eda89e021f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 24 Jun 2011 14:46:37 -0400
Subject: [PATCH] - Fix contacts copying (#1487967)
---
program/steps/addressbook/func.inc | 7 ++-----
program/steps/addressbook/copy.inc | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 4ee885b..1e4e753 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -40,7 +40,7 @@
// It maight happen when copying records from search result
// Do nothing, go to next source
- if ($target == $source) {
+ if ((string)$target == (string)$source) {
continue;
}
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 0f2d757..f7f3dbf 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -670,7 +670,7 @@
// containing contact ID and source name in form: <ID>-<SOURCE>
$cid = get_input_value('_cid', RCUBE_INPUT_GPC);
- $source = get_input_value('_source', RCUBE_INPUT_GPC);
+ $source = (string) get_input_value('_source', RCUBE_INPUT_GPC);
if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)) {
return array();
@@ -686,10 +686,7 @@
if (!$got_source) {
list ($c, $s) = explode('-', $id, 2);
if (strlen($s)) {
- $result[$s][] = $c;
- }
- else if (strlen($source)) {
- $result[$source][] = $c;
+ $result[(string)$s][] = $c;
}
}
else {
--
Gitblit v1.9.1