summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-06-24 18:46:37 +0000
committeralecpl <alec@alec.pl>2011-06-24 18:46:37 +0000
commit87a2f686f0c0477a33ffe563321cc3eda89e021f (patch)
treeebec17e19626f97ed726d73b9477f689a352fa41 /program
parent5bfa4445d52fc831330600e581656142b30f0ca3 (diff)
- Fix contacts copying (#1487967)
Diffstat (limited to 'program')
-rw-r--r--program/steps/addressbook/copy.inc2
-rw-r--r--program/steps/addressbook/func.inc7
2 files changed, 3 insertions, 6 deletions
diff --git a/program/steps/addressbook/copy.inc b/program/steps/addressbook/copy.inc
index 4ee885b3f..1e4e753b6 100644
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@@ -40,7 +40,7 @@ foreach ($cids as $source => $cid)
// 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 0f2d75705..f7f3dbfe9 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -670,7 +670,7 @@ function rcmail_get_cids()
// 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 @@ function rcmail_get_cids()
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 {