Changeset 4878 in subversion for trunk/roundcubemail/program/steps/addressbook/func.inc

Timestamp:

Jun 24, 2011 2:46:37 PM (2 years ago)

Author:

alec

Message:

• Fix contacts copying (#1487967)

File:

• trunk/roundcubemail/program/steps/addressbook/func.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -671 +671 @@
 
     $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)) {
@@ -687 +687 @@
             list ($c, $s) = explode('-', $id, 2);
             if (strlen($s)) {
-                $result[$s][] = $c;
-            }
-            else if (strlen($source)) {
-                $result[$source][] = $c;
+                $result[(string)$s][] = $c;
             }
         }