TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cannot use Cms\Classes\Controller as Controller because the name is already in use 

Remove test code
This commit is contained in:
Samuel Georges 2017-03-14 19:42:37 +11:00
parent e54cf7133b
commit ec18697ae2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/traits/FormModelSaver.php
View File

@ -28,8 +28,6 @@ trait FormModelSaver
* *
* $modelsToSave = $this->prepareModelsToSave($model, [...]); * $modelsToSave = $this->prepareModelsToSave($model, [...]);
* *
* $test = 'cms.theme.getActiveTheme';
*
* foreach ($modelsToSave as $modelToSave) { * foreach ($modelsToSave as $modelToSave) {
* $modelToSave->save(); * $modelToSave->save();
* } * }

4
modules/system/classes/ErrorHandler.php
View File

@ -5,7 +5,7 @@ use View;
use Config; use Config;
use Cms\Classes\Theme; use Cms\Classes\Theme;
use Cms\Classes\Router; use Cms\Classes\Router;
use Cms\Classes\Controller; use Cms\Classes\Controller as CmsController;
use October\Rain\Exception\ErrorHandler as ErrorHandlerBase; use October\Rain\Exception\ErrorHandler as ErrorHandlerBase;
use October\Rain\Exception\ApplicationException; use October\Rain\Exception\ApplicationException;
@ -66,7 +66,7 @@ class ErrorHandler extends ErrorHandlerBase
} }
// Route to the CMS error page. // Route to the CMS error page.
$controller = new Controller($theme); $controller = new CmsController($theme);
$result = $controller->run('/error'); $result = $controller->run('/error');
// Extract content from response object // Extract content from response object