Changeset 4609

Timestamp:

08/29/10 18:32:44 (18 months ago)

Author:

vain

Message:

• request and response are handed over to the dispatcher and no longer fetched from the dependency injector

Location:

trunk/core

Files:

• dispatcher.core.php (modified) (2 diffs)
• frontcontroller.core.php (modified) (1 diff)

trunk/core/dispatcher.core.php

@@ -57 +57 @@
      * The dispatcher forwards to the pagecontroller = modulecontroller + moduleaction
      */
-    public static function forward()
+    public static function forward($request, $response)
     {
         $route = Clansuite_HttpRequest::getRoute();
@@ -78 +78 @@
         #unset($route);
 
-        $controllerInstance = new $classname(
-                        Clansuite_CMS::getInjector()->instantiate('Clansuite_HttpRequest'),
-                        Clansuite_CMS::getInjector()->instantiate('Clansuite_HttpResponse')
-        );
+        $controllerInstance = new $classname($request, $response);
 
         # Initialize the Module

trunk/core/frontcontroller.core.php

@@ -145 +145 @@
         $event->triggerEvent('onBeforeDispatcherForward');
 
-        $this->dispatcher->forward();
+        $this->dispatcher->forward($this->request, $this->response);
 
         $event->triggerEvent('onAfterDispatcherForward');