Changeset 25012

Timestamp:

02/04/10 14:38:04 (7 months ago)

Author:

bergie

Message:

Validate route selection in dispatcher, not in templating

Files:

• trunk/midgardmvc/midgardmvc_core/services/dispatcher/manual.php (modified) (1 diff)
• trunk/midgardmvc/midgardmvc_core/services/templating/midgard.php (modified) (1 diff)

trunk/midgardmvc/midgardmvc_core/services/dispatcher/manual.php

@@ -62 +62 @@
-    {
-        $route_definitions = $this->get_routes();
+        if (!isset($route_definitions[$this->midgardmvc->context->route_id]))
+        {
+            throw new Exception("Route {$route_id} not defined for component {$this->midgardmvc->context->component}");
+        }
-
-        $selected_route_configuration = $route_definitions[$this->midgardmvc->context->route_id];

trunk/midgardmvc/midgardmvc_core/services/templating/midgard.php

@@ -359 +359 @@
-        // Then initialize the component, so it also goes to template stack
-        $this->dispatcher->initialize($request);
-        
-        $routes = $this->midgardmvc->configuration->normalize_routes();
-        $component_name = $this->midgardmvc->context->component;
-
-        if (!isset($routes[$route_id]))
-        {
-            throw new Exception("Route {$route_id} not defined for component {$component_name}");
-        }
-
-        $this->dispatcher->set_route($route_id, $arguments);
-        $this->dispatcher->dispatch();
-
+
+
-        $data = $this->midgardmvc->context->$component_name;
-