diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php index c7883ec2a..7f640857d 100644 --- a/modules/backend/behaviors/FormController.php +++ b/modules/backend/behaviors/FormController.php @@ -76,7 +76,7 @@ class FormController extends ControllerBehavior $config = $this->makeConfig($this->config->form); $config->model = $model; - $config->arrayName = Str::getRealClass($model); + $config->arrayName = class_basename($model); $config->context = $context; /* diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php index f16d474a3..a53fff7a5 100644 --- a/modules/backend/behaviors/RelationController.php +++ b/modules/backend/behaviors/RelationController.php @@ -1,7 +1,6 @@ field) $id .= '-' . $this->field; @@ -673,7 +672,7 @@ class RelationController extends ControllerBehavior elseif ($this->viewMode == 'single') { $config = $this->makeConfig($this->config->form); $config->model = $this->relationModel; - $config->arrayName = Str::getRealClass($this->relationModel); + $config->arrayName = class_basename($this->relationModel); $config->context = 'relation'; $config->alias = $this->alias . 'ViewForm'; @@ -732,7 +731,7 @@ class RelationController extends ControllerBehavior elseif ($this->manageMode == 'form' && isset($this->config->form)) { $config = $this->makeConfig($this->config->form); $config->model = $this->relationModel; - $config->arrayName = Str::getRealClass($this->relationModel); + $config->arrayName = class_basename($this->relationModel); $config->context = 'relation'; $config->alias = $this->alias . 'ManageForm'; @@ -778,7 +777,7 @@ class RelationController extends ControllerBehavior { $config = $this->makeConfig($this->config->pivot); $config->model = $this->relationModel; - $config->arrayName = Str::getRealClass($this->relationModel); + $config->arrayName = class_basename($this->relationModel); $config->context = 'relation'; $config->alias = $this->alias . 'ManagePivotForm'; diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index 7d9bc117a..88d6557df 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -1,7 +1,6 @@ action; + $id = class_basename(get_called_class()) . '-' . $this->action; if ($suffix !== null) $id .= '-' . $suffix; diff --git a/modules/backend/classes/Skin.php b/modules/backend/classes/Skin.php index 39598eba7..f2041ec8b 100644 --- a/modules/backend/classes/Skin.php +++ b/modules/backend/classes/Skin.php @@ -1,6 +1,5 @@ skinPath = $classFile ? $classFile . '/' . $classFolder diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index 0c14e3b99..cab703203 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -123,7 +123,7 @@ abstract class WidgetBase */ public function getId($suffix = null) { - $id = Str::getRealClass(get_called_class()); + $id = class_basename(get_called_class()); if ($this->alias != $this->defaultAlias) $id .= '-' . $this->alias; diff --git a/modules/cms/twig/DebugExtension.php b/modules/cms/twig/DebugExtension.php index 4ed828d6e..9546fbd5b 100644 --- a/modules/cms/twig/DebugExtension.php +++ b/modules/cms/twig/DebugExtension.php @@ -1,6 +1,5 @@ Component'; diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php index c689cf3da..2db37def9 100644 --- a/modules/system/controllers/Settings.php +++ b/modules/system/controllers/Settings.php @@ -1,6 +1,5 @@ getFieldConfig(); $config->model = $model; - $config->arrayName = Str::getRealClass($model); + $config->arrayName = class_basename($model); $config->context = 'update'; $widget = $this->makeWidget('Backend\Widgets\Form', $config); diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php index faf5848a0..7c0d40be7 100644 --- a/modules/system/traits/ConfigMaker.php +++ b/modules/system/traits/ConfigMaker.php @@ -1,6 +1,5 @@