Changeset 5814
- Timestamp:
- 11/02/07 16:47:53 (1 year ago)
- Files:
-
- trunk/lib/action/sfActions.class.php (modified) (3 diffs)
- trunk/lib/action/sfComponent.class.php (modified) (1 diff)
- trunk/lib/action/sfComponents.class.php (modified) (1 diff)
- trunk/lib/filter/sfExecutionFilter.class.php (modified) (1 diff)
- trunk/lib/plugins/sfCompat10Plugin/lib/filter/sfValidationExecutionFilter.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/action/sfActions.class.php
r4951 r5814 27 27 * defined action name. 28 28 * 29 * @return string A string containing the view name associated with this action 29 * @param sfRequest The current sfRequest object 30 * 31 * @return string A string containing the view name associated with this action 30 32 * 31 33 * @throws sfInitializationException … … 33 35 * @see sfAction 34 36 */ 35 public function execute( )37 public function execute($request) 36 38 { 37 39 // dispatch action … … 49 51 50 52 // run action 51 $ret = $this->$actionToRun(); 52 53 return $ret; 53 return $this->$actionToRun($request); 54 54 } 55 55 } trunk/lib/action/sfComponent.class.php
r5379 r5814 69 69 * single product. 70 70 * 71 * @return mixed A string containing the view name associated with this action 72 */ 73 abstract function execute(); 71 * @param sfRequest The current sfRequest object 72 * 73 * @return mixed A string containing the view name associated with this action 74 */ 75 abstract function execute($request); 74 76 75 77 /** trunk/lib/action/sfComponents.class.php
r4597 r5814 19 19 abstract class sfComponents extends sfComponent 20 20 { 21 public function execute( )21 public function execute($request) 22 22 { 23 23 throw new sfInitializationException('sfComponents initialization failed.'); trunk/lib/filter/sfExecutionFilter.class.php
r5384 r5814 101 101 // execute the action 102 102 $actionInstance->preExecute(); 103 $viewName = $actionInstance->execute( );103 $viewName = $actionInstance->execute($this->context->getRequest()); 104 104 $actionInstance->postExecute(); 105 105 trunk/lib/plugins/sfCompat10Plugin/lib/filter/sfValidationExecutionFilter.class.php
r5384 r5814 158 158 // execute the action 159 159 $actionInstance->preExecute(); 160 $viewName = $actionInstance->execute( );160 $viewName = $actionInstance->execute($this->context->getRequest()); 161 161 $actionInstance->postExecute(); 162 162