| ... | ... |
@@ -266,8 +266,7 @@ class Application{
|
| 266 | 266 |
$object = new $eh['class']; |
| 267 | 267 |
$reflection = new \ReflectionMethod($object, $eh['function']); |
| 268 | 268 |
$fire_args = array(); |
| 269 |
- $fire_args[] = $this->request; |
|
| 270 |
- $fire_args[] = $this->router->routeInfo; |
|
| 269 |
+ $fire_args[] = $this; |
|
| 271 | 270 |
if(isset($eh['arguments'])){
|
| 272 | 271 |
$this->router->routeInfo::eventHandlerArgumentsFormatCheck($eh['arguments'], $args); |
| 273 | 272 |
$fire_args = array_merge($fire_args, $args); |
| ... | ... |
@@ -83,15 +83,15 @@ class View{
|
| 83 | 83 |
|
| 84 | 84 |
$viewEngineClass = $viewEngine->class; |
| 85 | 85 |
if(isset($viewEngine->config)){
|
| 86 |
- $view = new $viewEngineClass($viewEngine->config); |
|
| 86 |
+ $view = new $viewEngineClass($this->_L3, $viewEngine->config); |
|
| 87 | 87 |
} |
| 88 | 88 |
else{
|
| 89 | 89 |
$refl = new \ReflectionClass($viewEngineClass); |
| 90 | 90 |
if($refl->inNamespace()&&class_exists($refl->getNamespaceName().'\\Config')){
|
| 91 |
- $view = new $viewEngineClass($refl->getNamespaceName().'\\Config'); |
|
| 91 |
+ $view = new $viewEngineClass($this->_L3, $refl->getNamespaceName().'\\Config'); |
|
| 92 | 92 |
} |
| 93 | 93 |
else{
|
| 94 |
- $view = new $viewEngineClass(); |
|
| 94 |
+ $view = new $viewEngineClass($this->_L3); |
|
| 95 | 95 |
} |
| 96 | 96 |
} |
| 97 | 97 |
return $view->render($this->viewFile, $this->context); |