tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 09:14:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'void' method result used in the Dispatcher

Browse Source 
refs #5786
This commit is contained in:
Eric Lippmann 2015-08-17 13:31:05 +02:00
parent 8b32edd6e9
commit 965fee1e9e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Web/Controller/Dispatcher.php
View File

@ -27,7 +27,8 @@ class Dispatcher extends Zend_Controller_Dispatcher_Standard
$this->setResponse($response); $this->setResponse($response);
$controllerName = $request->getControllerName(); $controllerName = $request->getControllerName();
if (! $controllerName) { if (! $controllerName) {
return parent::dispatch($request, $response); parent::dispatch($request, $response);
return;
} }
$controllerName = ucfirst($controllerName) . 'Controller'; $controllerName = ucfirst($controllerName) . 'Controller';
if ($this->_defaultModule === $this->_curModule) { if ($this->_defaultModule === $this->_curModule) {
@ -36,7 +37,8 @@ class Dispatcher extends Zend_Controller_Dispatcher_Standard
$controllerClass = 'Icinga\\Module\\' . $this->_curModule . '\\Controllers\\' . $controllerName; $controllerClass = 'Icinga\\Module\\' . $this->_curModule . '\\Controllers\\' . $controllerName;
} }
if (! class_exists($controllerClass)) { if (! class_exists($controllerClass)) {
return parent::dispatch($request, $response); parent::dispatch($request, $response);
return;
} }
$controller = new $controllerClass($request, $response, $this->getParams()); $controller = new $controllerClass($request, $response, $this->getParams());
$actionName = $request->getActionName(); $actionName = $request->getActionName();