The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: d8c2ef2c1eb7ce0c72f37a16b77f9cc661b45973 1631298 [mms] Fix destroying session data when the null session driver is used. a9d3e30 phpdoc 9f0bc70 Abstract main session class so extended null class doesn't need to extend much of anything 5ec977a Fix logic 947400a Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 16312980de8a03d7945a89e587b24d8fa77c92c6 Author: Michael M Slusarz <[email protected]> Date: Tue Feb 12 00:56:42 2013 -0700 [mms] Fix destroying session data when the null session driver is used. You can't destroy a session that isn't active. Use session_unset() instead framework/Core/lib/Horde/Session/Null.php | 14 ++++---------- framework/Core/package.xml | 4 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) http://git.horde.org/horde-git/-/commit/16312980de8a03d7945a89e587b24d8fa77c92c6 ----------------------------------------------------------------------- commit a9d3e30926ae1212ef896872149ac15a4e0c9412 Author: Michael M Slusarz <[email protected]> Date: Tue Feb 12 00:43:51 2013 -0700 phpdoc framework/Core/lib/Horde/Session/Null.php | 100 +++++++---------------------- 1 files changed, 24 insertions(+), 76 deletions(-) http://git.horde.org/horde-git/-/commit/a9d3e30926ae1212ef896872149ac15a4e0c9412 ----------------------------------------------------------------------- commit 9f0bc70e891c8a8b1796f2ee6ea11e52f316005f Author: Michael M Slusarz <[email protected]> Date: Tue Feb 12 00:44:07 2013 -0700 Abstract main session class so extended null class doesn't need to extend much of anything Even before this change, much of the null class was already duplicative and unncessary framework/Core/lib/Horde/Session.php | 59 +++++---- framework/Core/lib/Horde/Session/Null.php | 199 +--------------------------- 2 files changed, 42 insertions(+), 216 deletions(-) http://git.horde.org/horde-git/-/commit/9f0bc70e891c8a8b1796f2ee6ea11e52f316005f ----------------------------------------------------------------------- commit 5ec977a63807b9939c88aaae93a581af03f90385 Author: Michael M Slusarz <[email protected]> Date: Tue Feb 12 00:55:41 2013 -0700 Fix logic imp/lib/Compose.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/5ec977a63807b9939c88aaae93a581af03f90385 ----------------------------------------------------------------------- commit 947400a0ace9cb5b05a04f9bc87549bdc38d60cc Merge: d8c2ef2 5ec977a Author: Michael M Slusarz <[email protected]> Date: Tue Feb 12 01:05:40 2013 -0700 Merge branch 'master' into imp_6_1 Conflicts: imp/lib/Compose.php framework/Core/lib/Horde/Session.php | 59 ++++--- framework/Core/lib/Horde/Session/Null.php | 299 +++-------------------------- framework/Core/package.xml | 4 +- imp/lib/Compose.php | 5 +- 4 files changed, 68 insertions(+), 299 deletions(-) http://git.horde.org/horde-git/-/commit/947400a0ace9cb5b05a04f9bc87549bdc38d60cc -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
