Changeset 2528

Timestamp:

06/23/08 21:58:11 (7 months ago)

Author:

david

Message:

Arguments passed to AgaviController::dispatch() should have precedence over routing results, closes #777

Location:

branches/0.11

Files:

• CHANGELOG (modified) (1 diff)
• src/controller/AgaviController.class.php (modified) (1 diff)

branches/0.11/CHANGELOG

@@ -12 +12 @@
 ADD: Allow nested routing structures with concatenated name or action attributes in ancestors other than immediate parents (Dominik) (#764)
 
+CHG: Arguments passed to AgaviController::dispatch() should have precedence over routing results (#777) (David)
 CHG: Introduce generic AgaviStreamLoggerAppender (#773) (David)
 CHG: Make AgaviLoggerAppender an AgaviParameterHolder (#774) (David)

branches/0.11/src/controller/AgaviController.class.php

@@ -163 +163 @@
     try {
       
+      // match routes and assign returned initial execution container
+      $container = $this->context->getRouting()->execute();
+      
+      // merge in any arguments given. they need to have precedence over what the routing found
       $requestData = $this->context->getRequest()->getRequestData();
       if($arguments !== null) {
         $requestData->merge($arguments);
       }
-      
-      // match routes and assign returned initial execution container
-      $container = $this->context->getRouting()->execute();
       
       $moduleName = $container->getModuleName();