diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1ee4873..4305c00 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1141,7 +1141,7 @@ final class ApiController extends Controller } // handle Routes of already installed modules - foreach ($installed as $module => $data) { + foreach ($installed as $module => $_) { $class = '\Modules\\' . $module . '\Admin\Status'; $moduleInfo = new ModuleInfo(__DIR__ . '/../../../Modules/' . $module . '/info.json'); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 5380b1e..d4e6405 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -205,7 +205,12 @@ final class BackendController extends Controller $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response); /** @var \Modules\Admin\Models\Account $account */ - $account = AccountMapper::get()->with('groups')->with('l11n')->where('id', (int) $request->getData('id'))->execute(); + $account = AccountMapper::get() + ->with('groups') + ->with('l11n') + ->where('id', (int) $request->getData('id')) + ->execute(); + if ($account->l11n->id === 0) { $account->l11n->loadFromLanguage($request->header->l11n->language); } diff --git a/Theme/Backend/Components/AccountPermissionSelector/BaseView.php b/Theme/Backend/Components/AccountPermissionSelector/BaseView.php index 6e7d7e2..451d49c 100644 --- a/Theme/Backend/Components/AccountPermissionSelector/BaseView.php +++ b/Theme/Backend/Components/AccountPermissionSelector/BaseView.php @@ -59,7 +59,7 @@ class BaseView extends View /** * {@inheritdoc} */ - public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector'); diff --git a/Theme/Backend/Components/AddressEditor/AddressView.php b/Theme/Backend/Components/AddressEditor/AddressView.php index 259de00..4567d80 100644 --- a/Theme/Backend/Components/AddressEditor/AddressView.php +++ b/Theme/Backend/Components/AddressEditor/AddressView.php @@ -81,7 +81,7 @@ class AddressView extends View /** * {@inheritdoc} */ - public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/AddressEditor/addresses'); diff --git a/Theme/Backend/Components/ContactEditor/ContactView.php b/Theme/Backend/Components/ContactEditor/ContactView.php index 963568b..31bec73 100644 --- a/Theme/Backend/Components/ContactEditor/ContactView.php +++ b/Theme/Backend/Components/ContactEditor/ContactView.php @@ -81,7 +81,7 @@ class ContactView extends View /** * {@inheritdoc} */ - public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/ContactEditor/contacts'); diff --git a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php index 2c935ba..b56825e 100755 --- a/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php +++ b/Theme/Backend/Components/GroupTagSelector/GroupTagSelectorPopupView.php @@ -41,7 +41,7 @@ class GroupTagSelectorPopupView extends View /** * {@inheritdoc} */ - public function __construct(?L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response) + public function __construct(L11nManager $l11n, RequestAbstract $request, ResponseAbstract $response) { parent::__construct($l11n, $request, $response); $this->setTemplate('/Modules/Admin/Theme/Backend/Components/GroupTagSelector/group-selector-popup'); diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index e37e52f..356d5db 100755 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -85,7 +85,7 @@ $tableView->setObjects($modules); } ?>