tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.5' into 4.6

This commit is contained in:
Aaron Carlino 2020-10-05 13:49:06 +13:00
parent 90512430d7 2042d1c6b0
commit 8053bc7a72
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Dev/DevelopmentAdmin.php
View File

@ -130,7 +130,7 @@ class DevelopmentAdmin extends Controller
$controllerClass = null;
$baseUrlPart = $request->param('Action');
$reg = Config::inst()->get(__CLASS__, 'registered_controllers');
$reg = Config::inst()->get(static::class, 'registered_controllers');
if (isset($reg[$baseUrlPart])) {
$controllerClass = $reg[$baseUrlPart]['controller'];
}
@ -139,7 +139,7 @@ class DevelopmentAdmin extends Controller
return $controllerClass::create();
}
$msg = 'Error: no controller registered in ' . __CLASS__ . ' for: ' . $request->param('Action');
$msg = 'Error: no controller registered in ' . static::class . ' for: ' . $request->param('Action');
if (Director::is_cli()) {
// in CLI we cant use httpError because of a bug with stuff being in the output already, see DevAdminControllerTest
throw new Exception($msg);
@ -162,7 +162,7 @@ class DevelopmentAdmin extends Controller
{
$links = [];
$reg = Config::inst()->get(__CLASS__, 'registered_controllers');
$reg = Config::inst()->get(static::class, 'registered_controllers');
foreach ($reg as $registeredController) {
if (isset($registeredController['links'])) {
foreach ($registeredController['links'] as $url => $desc) {
@ -175,7 +175,7 @@ class DevelopmentAdmin extends Controller
protected function getRegisteredController($baseUrlPart)
{
$reg = Config::inst()->get(__CLASS__, 'registered_controllers');
$reg = Config::inst()->get(static::class, 'registered_controllers');
if (isset($reg[$baseUrlPart])) {
$controllerClass = $reg[$baseUrlPart]['controller'];