From 4123786cdee4de4460380af24735435c90218983 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 26 Oct 2010 05:52:43 +0200
Subject: [PATCH] Use "create", adapt to Horde_Session.

---
 framework/Core/lib/Horde/Core/Factory/KolabServer.php  | 2 +-
 framework/Core/lib/Horde/Core/Factory/KolabSession.php | 7 +++----
 framework/Core/lib/Horde/Core/Factory/KolabStorage.php | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/framework/Core/lib/Horde/Core/Factory/KolabServer.php b/framework/Core/lib/Horde/Core/Factory/KolabServer.php
index 30756c787..1a5a534c1 100644
--- a/framework/Core/lib/Horde/Core/Factory/KolabServer.php
+++ b/framework/Core/lib/Horde/Core/Factory/KolabServer.php
@@ -345,7 +345,7 @@ class Horde_Core_Factory_KolabServer
      *                                      Horde_Kolab_Server_Composite
      *                                      instance.
      */
-    public function getComposite()
+    public function create()
     {
         return new Horde_Kolab_Server_Composite(
             $this->getServer(),
diff --git a/framework/Core/lib/Horde/Core/Factory/KolabSession.php b/framework/Core/lib/Horde/Core/Factory/KolabSession.php
index a8306e9a2..5b58d8a0c 100644
--- a/framework/Core/lib/Horde/Core/Factory/KolabSession.php
+++ b/framework/Core/lib/Horde/Core/Factory/KolabSession.php
@@ -108,10 +108,9 @@ class Horde_Core_Factory_KolabSession
      */
     public function getStorage()
     {
-        $storage = new Horde_Kolab_Session_Storage_Sessionobjects(
-            new Horde_SessionObjects()
+        return new Horde_Kolab_Session_Storage_Session(
+            $GLOBALS['session']
         );
-        return $storage;
     }
 
     /**
@@ -185,7 +184,7 @@ class Horde_Core_Factory_KolabSession
      *
      * @return Horde_Kolab_Session The session handler.
      */
-    public function getSession()
+    public function create()
     {
         $storage = $this->_injector->getInstance('Horde_Kolab_Session_Storage_Interface');
         $session = $storage->load();
diff --git a/framework/Core/lib/Horde/Core/Factory/KolabStorage.php b/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
index 2cf5facd7..71f17a60a 100644
--- a/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
+++ b/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
@@ -83,7 +83,7 @@ class Horde_Core_Factory_KolabStorage
      *
      * @return Horde_Kolab_Storage The storage handler.
      */
-    public function getStorage()
+    public function create()
     {
         $configuration = $this->_injector->getInstance('Horde_Kolab_Storage_Configuration');
 
-- 
2.11.0