[commits] Horde branch master updated. cce6d9b7f92cec34beedb6850e20cd969266d2f1

[Jan Schneider]

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

from: eb980c210ead379173dbb6dad3a3191197e0cb9b

5fff3c3 Use array_replace_recursive() if available.
e50d7b1 Add reminder to remove in the future.
ffb6ccd Rename Horde_Array::array_merge_recursive_overwrite() to Horde_Array::replaceRecursive().
4f469ac Add a common method for configuration loading.
cce6d9b Make method compatible with base class (Bug #9486).

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

commit 5fff3c366c74a5c05ab15b4e1c8ddf15e517a0b7
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jan 3 12:56:30 2011 +0100

    Use array_replace_recursive() if available.

 framework/Util/lib/Horde/Array.php           |    4 ++++
 framework/Util/test/Horde/Util/ArrayTest.php |   24 +++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5fff3c366c74a5c05ab15b4e1c8ddf15e517a0b7

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

commit e50d7b1622c365e17b3c8bfafbfa385295686948
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jan 3 12:57:32 2011 +0100

    Add reminder to remove in the future.

 framework/Util/lib/Horde/Array.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/e50d7b1622c365e17b3c8bfafbfa385295686948

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

commit ffb6ccdae28485a5898140924e4b9052d246b74d
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jan 3 13:05:20 2011 +0100

    Rename Horde_Array::array_merge_recursive_overwrite() to Horde_Array::replaceRecursive().

 framework/Core/lib/Horde/Core/Factory/MimeViewer.php |    2 +-
 framework/Core/lib/Horde/Registry.php                |    2 +-
 framework/Util/lib/Horde/Array.php                   |    8 +--
 framework/Util/package.xml                           |   44 +++++++++--------
 framework/Util/test/Horde/Util/ArrayTest.php         |    2 +-
 luxor/lib/Luxor.php                                  |    8 ++--
 luxor/source.php                                     |    4 +-
 7 files changed, 35 insertions(+), 35 deletions(-)

http://git.horde.org/horde-git/-/commit/ffb6ccdae28485a5898140924e4b9052d246b74d

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

commit 4f469acadac1ea2c8bd505640d33e891045ff9a9
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jan 3 13:39:27 2011 +0100

    Add a common method for configuration loading.

 .gitignore                                            |    1 +
 framework/Alarm/test/Horde/Alarm/SqlTest.php          |   10 +----
 framework/Db/test/Horde/Db/Adapter/MysqlSuite.php     |   24 +++++-------
 framework/Db/test/Horde/Db/Adapter/MysqliSuite.php    |   24 +++++-------
 framework/Db/test/Horde/Db/Adapter/Pdo/MysqlSuite.php |   24 +++++-------
 framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlSuite.php |   23 ++++-------
 framework/Db/test/Horde/Db/Adapter/conf.php.dist      |    2 +
 framework/Ldap/test/Horde/Ldap/TestBase.php           |   11 ++---
 framework/Test/lib/Horde/Test/Case.php                |   34 +++++++++++++++++
 9 files changed, 83 insertions(+), 70 deletions(-)

http://git.horde.org/horde-git/-/commit/4f469acadac1ea2c8bd505640d33e891045ff9a9

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

commit cce6d9b7f92cec34beedb6850e20cd969266d2f1
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jan 3 14:48:35 2011 +0100

    Make method compatible with base class (Bug #9486).

 framework/Share/lib/Horde/Share/Sql/Hierarchical.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/cce6d9b7f92cec34beedb6850e20cd969266d2f1