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/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/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. 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..8ab5540be66 --- /dev/null +++ b/app/code/core/Mage/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php @@ -0,0 +1,40 @@ +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();