From c58d65e7483702c9eadfd62cc639a529cc182a07 Mon Sep 17 00:00:00 2001 From: Judx Date: Wed, 3 Jan 2024 15:29:08 +0200 Subject: [PATCH 1/3] Fixed configuration name typo --- .../Mage/Adminhtml/controllers/Permissions/UserController.php | 2 +- app/code/core/Mage/Core/etc/system.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php index c2fa224a18f..5be3c7c4a5a 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/UserController.php @@ -151,7 +151,7 @@ public function saveAction() try { $model->save(); // Send notification to General and additional contacts (if declared) that a new admin user was created. - if (Mage::getStoreConfigFlag('admin/security/crate_admin_user_notification') && $isNew) { + if (Mage::getStoreConfigFlag('admin/security/create_admin_user_notification') && $isNew) { Mage::getModel('admin/user')->sendAdminNotification($model); } if ($uRoles = $this->getRequest()->getParam('roles', false)) { diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml index 489b1e6fcf2..eecee197164 100644 --- a/app/code/core/Mage/Core/etc/system.xml +++ b/app/code/core/Mage/Core/etc/system.xml @@ -1256,7 +1256,7 @@ 0 0 - + This setting enable notification when new admin user created. select @@ -1265,7 +1265,7 @@ 1 0 0 - + The recommended value is 85, a higher value will increase the file size. You can set the value to 0 to disable image processing, but it may cause security risks. From 36b58f530f5f8ca0335e30557c619e01cfd13fd5 Mon Sep 17 00:00:00 2001 From: Judx Date: Wed, 3 Jan 2024 16:51:32 +0200 Subject: [PATCH 2/3] Add setup script and bump Mage_Core from 1.6.0.10 to 1.6.0.11 --- app/code/core/Mage/Core/etc/config.xml | 2 +- .../core_setup/upgrade-1.6.0.10-1.6.0.11.php | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml index d7ce041219d..3673dd77475 100644 --- a/app/code/core/Mage/Core/etc/config.xml +++ b/app/code/core/Mage/Core/etc/config.xml @@ -17,7 +17,7 @@ - 1.6.0.10 + 1.6.0.11 diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php new file mode 100644 index 00000000000..995c66eff9f --- /dev/null +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php @@ -0,0 +1,41 @@ +startSetup(); + +$table = $installer->getTable('core/config_data'); + +if ($installer->getConnection()->isTableExists($table)) { + $oldPath = 'admin/security/crate_admin_user_notification'; + $newPath = 'admin/security/create_admin_user_notification'; + + $select = $installer->getConnection()->select() + ->from($table, ['config_id', 'path']) + ->where('path = ?', $oldPath); + + $rows = $installer->getConnection()->fetchAll($select); + + foreach ($rows as $row) { + $installer->getConnection()->update( + $table, + ['path' => $newPath], + ['config_id = ?' => $row['config_id']] + ); + } +} + +$installer->endSetup(); From f0d429320624858723a71b863402e291e02f1811 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 6 Feb 2024 17:23:02 +0000 Subject: [PATCH 3/3] updated copyright --- .../Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php index 995c66eff9f..8ab5540be66 100644 --- a/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php @@ -8,8 +8,7 @@ * * @category Mage * @package Mage_Core - * @copyright Copyright (c) 2006-2020 Magento, Inc. (https://www.magento.com) - * @copyright Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org) + * @copyright Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org) * @license https://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */