[commits] Horde branch horde_5_2 updated. 26eedc516ad00c28810e9a60d9d50815e0884505

[Michael J. Rubinsky]

The branch "horde_5_2" has been updated.
The following is a summary of the commits.

from: a03a3c0d33d9235502b8ee4864eef443d179a0c0

22b5441 Simplify, and ensure we always return an array.
a5a9141 API: Fix PHP error when given a list of uids to delete. Bug #12790
ee6c576 BFN
26eedc5 Merge branch 'master' into horde_5_2

Summary: http://github.com/horde/horde/compare/a03a3c0d33d9235502b8ee4864eef443d179a0c0...26eedc516ad00c28810e9a60d9d50815e0884505

-----------------------------------------------------------------------

commit 22b54418cd26d088545d8d085721d37d239484e3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:49:13 2013 -0400

    Simplify, and ensure we always return an array.
    
    Bug: 12791

 framework/Core/lib/Horde/Core/ActiveSync/Connector.php |   28 ++++++++-------
 1 files changed, 15 insertions(+), 13 deletions(-)

http://github.com/horde/horde/commit/22b54418cd26d088545d8d085721d37d239484e3
http://git.horde.org/horde-git/-/commit/22b54418cd26d088545d8d085721d37d239484e3

-----------------------------------------------------------------------

commit a5a9141ad5fb614e296b892ad671c70e8352c526
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Thu Oct 24 15:37:05 2013 +0200

    API: Fix PHP error when given a list of uids to delete. Bug #12790
    
    When we pass an array of uids to delete,
    we should return after processing them.
    
    Fixes this error when using a Kolab backend:
    2013-10-23T10:53:27+02:00 WARN: HORDE [mnemo] PHP ERROR: base64_encode() expects parameter 1 to be string, array given [pid 11460 on line 375 of "/datastore/share/pear/Horde/Url.php"]
    
    Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>

 mnemo/lib/Api.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/a5a9141ad5fb614e296b892ad671c70e8352c526
http://git.horde.org/horde-git/-/commit/a5a9141ad5fb614e296b892ad671c70e8352c526

-----------------------------------------------------------------------

commit ee6c57653ca4d16590f5ec5b3a794e16e2ad262c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:56:27 2013 -0400

    BFN

 mnemo/docs/CHANGES |    2 ++
 mnemo/package.xml  |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/ee6c57653ca4d16590f5ec5b3a794e16e2ad262c
http://git.horde.org/horde-git/-/commit/ee6c57653ca4d16590f5ec5b3a794e16e2ad262c

-----------------------------------------------------------------------

commit 26eedc516ad00c28810e9a60d9d50815e0884505
Merge: a03a3c0 ee6c576
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:58:13 2013 -0400

    Merge branch 'master' into horde_5_2

 framework/Core/lib/Horde/Core/ActiveSync/Connector.php |   28 ++++++++-------
 mnemo/docs/CHANGES                                     |    2 +
 mnemo/lib/Api.php                                      |    2 +-
 mnemo/package.xml                                      |    4 ++-
 4 files changed, 21 insertions(+), 15 deletions(-)

http://github.com/horde/horde/commit/26eedc516ad00c28810e9a60d9d50815e0884505
http://git.horde.org/horde-git/-/commit/26eedc516ad00c28810e9a60d9d50815e0884505