[commits] Horde branch develop updated. 59fb0a7c7f1005b520ecddf6ccf831b0bd460de4

Jan Schneider jan at horde.org
Sun Feb 12 15:20:36 UTC 2012


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

from: 294160ff297ec7b6ad271e62b175476cf8f5ca45

9281c37 There are no mirrors anymore.
788a525 [jan] Don't start transaction more than once in SQL driver (Bug #10978).
c43fd54 Fix function call
311ba91 Sanity checking on data.
db03218 Copy charset param from DB config to base driver config
1888c3f [mms] Fix saving initial_page preference.
2b67b91 Fix case where page was reloaded and old UID no longer exists.
74ac507 Avoid repeated method calls, and don't silence more than we mean to.
024c33d space consistency
3b553ed Bug #10979: Better error message when missing required parameters.
bf3624f Actually do silence the unserialize() call.
59fb0a7 Merge branch 'master' into develop

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

commit 9281c37190bae0bc58c072add0d422686065d8b4
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 7 16:16:21 2012 +0100

    There are no mirrors anymore.

 framework/Release/lib/Horde/Release.php |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/9281c37190bae0bc58c072add0d422686065d8b4

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

commit 788a5259f75d697d4bab5cd3c69f7660176a9316
Author: Jan Schneider <jan at horde.org>
Date:   Fri Feb 10 18:51:27 2012 +0100

    [jan] Don't start transaction more than once in SQL driver (Bug #10978).

 framework/SessionHandler/lib/Horde/SessionHandler/Storage/Sql.php |    4 +++-
 framework/SessionHandler/package.xml                              |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/788a5259f75d697d4bab5cd3c69f7660176a9316

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

commit c43fd5478d4a16506e4d495b27257593c66da8e1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 10 12:31:37 2012 -0700

    Fix function call

 horde/login.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 311ba91d16ff96d8e8b283ec6b02170f33cc0d36
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 10 13:22:35 2012 -0700

    Sanity checking on data.
    
    Bad data will result in less than 3 elements, causing undefined errors.

 turba/lib/Data/Ldif.php |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/311ba91d16ff96d8e8b283ec6b02170f33cc0d36

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

commit db0321860f005cbdafd2d61b22c673aeef11e466
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 10 13:34:11 2012 -0700

    Copy charset param from DB config to base driver config

 turba/lib/Factory/Driver.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

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

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

commit 1888c3f41e5eb0e108aad824bb6c91fcd4fff7e1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 10 14:18:38 2012 -0700

    [mms] Fix saving initial_page preference.

 imp/docs/CHANGES     |    1 +
 imp/lib/Prefs/Ui.php |    2 +-
 imp/package.xml      |    2 ++
 3 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/1888c3f41e5eb0e108aad824bb6c91fcd4fff7e1

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

commit 2b67b9141cc6cf93f393d3ed74e82035296ef638
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 10 14:26:50 2012 -0700

    Fix case where page was reloaded and old UID no longer exists.

 imp/lib/Views/ListMessages.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/2b67b9141cc6cf93f393d3ed74e82035296ef638

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

commit 74ac507d472a489e25c6fd02f94616a94977422e
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Sat Feb 11 22:14:45 2012 -0500

    Avoid repeated method calls, and don't silence more than we mean to.
    
    Putting an @ in front of a whole nested line can hide errors and make debugging
    hard. Just silence errors unserializing instead.

 framework/Core/lib/Horde/Registry.php |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/74ac507d472a489e25c6fd02f94616a94977422e

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

commit 024c33d20403b933c0ab74e7436b8a99acdf5b28
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Sat Feb 11 22:15:56 2012 -0500

    space consistency

 framework/Http/lib/Horde/Http/Response/Base.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/024c33d20403b933c0ab74e7436b8a99acdf5b28

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

commit 3b553ed03f17be2b1ae00ed2037f1db0aceb6174
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Feb 11 22:06:03 2012 -0700

    Bug #10979: Better error message when missing required parameters.

 framework/Core/lib/Horde/Core/Factory/Auth.php |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/3b553ed03f17be2b1ae00ed2037f1db0aceb6174

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

commit bf3624ffea619ecf96bdd23db883672dd9b680cb
Author: Jan Schneider <jan at horde.org>
Date:   Sun Feb 12 16:17:23 2012 +0100

    Actually do silence the unserialize() call.

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

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

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

commit 59fb0a7c7f1005b520ecddf6ccf831b0bd460de4
Merge: 294160f bf3624f
Author: Jan Schneider <jan at horde.org>
Date:   Sun Feb 12 16:20:24 2012 +0100

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Core/lib/Horde/Registry.php

 framework/Core/lib/Horde/Core/Factory/Auth.php                    |   10 ++++-
 framework/Core/lib/Horde/Registry.php                             |    5 +-
 framework/SessionHandler/lib/Horde/SessionHandler/Storage/Sql.php |    4 +-
 framework/SessionHandler/package.xml                              |    4 +-
 horde/login.php                                                   |    2 +-
 imp/docs/CHANGES                                                  |    1 +
 imp/lib/Prefs/Ui.php                                              |    2 +-
 imp/lib/Views/ListMessages.php                                    |   10 ++--
 imp/package.xml                                                   |    2 +
 turba/lib/Data/Ldif.php                                           |   10 +++-
 turba/lib/Factory/Driver.php                                      |    5 ++
 11 files changed, 38 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/59fb0a7c7f1005b520ecddf6ccf831b0bd460de4




More information about the commits mailing list