diff --git a/README.md b/README.md index 245fcf9fd88..e096eb78b03 100644 --- a/README.md +++ b/README.md @@ -271,7 +271,7 @@ UPS shut down their old CGI APIs so we removed the support for it from the Mage_ - PHP 8.1 as minimum required version - Removed scriptaculous/dragdrop.js (#3215) -- RWD theme: updated jQuery to 3.7.0 (#3204) +- RWD theme: updated jQuery to 3.7.0 (#3204), removed enquire.js (#3208) - Unified CSRF configuration (#3147) and added form key validation to Contacts form (#3146) - Removed double span element from HTML buttons (#3123) - Removed all deprecated Mysql4_ classes (#2730). If there are any old modules/extensions in your installation that use such classes, you must run `shell/rename-mysql4-class-to-resource.php` in the command line in order to convert them. Backup all files before running the script diff --git a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php b/app/code/core/Mage/Admin/Model/Mysql4/Acl.php deleted file mode 100644 index 0a91acbe731..00000000000 --- a/app/code/core/Mage/Admin/Model/Mysql4/Acl.php +++ /dev/null @@ -1,25 +0,0 @@ - Mage_Admin_Model_Resource - admin_mysql4 admin_user
diff --git a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php b/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php deleted file mode 100644 index 332ba536236..00000000000 --- a/app/code/core/Mage/AdminNotification/Model/Mysql4/Inbox.php +++ /dev/null @@ -1,25 +0,0 @@ - Mage_AdminNotification_Model_Resource - adminnotification_mysql4 adminnotification_inbox
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php index 503a2ed4107..e60d0bc723f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php @@ -85,7 +85,7 @@ public function getCategoryCollection() if (is_null($collection)) { $collection = Mage::getModel('catalog/category')->getCollection(); - /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection $collection */ + /** @var Mage_Catalog_Model_Resource_Category_Collection $collection */ $collection->addAttributeToSelect('name') ->addAttributeToSelect('is_active') ->setProductStoreId($storeId) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php index 6ff8a70046d..e857eb6df88 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php @@ -167,7 +167,7 @@ protected function _getNodeJson($node, $level = 0) /** * Adds some extra params to categories collection * - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection + * @return Mage_Catalog_Model_Resource_Category_Collection */ public function getCategoryCollection() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php index fa60d033346..4afb3aa4b70 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php @@ -41,7 +41,7 @@ protected function _prepareForm() $form->addField($this->getData('editor_element_id'), 'editor', [ 'name' => 'content', - 'style' => 'width:725px;height:460px', + 'style' => 'height:460px', 'required' => true, 'force_load' => true, 'config' => Mage::getSingleton('cms/wysiwyg_config')->getConfig($config) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php index 54b9d1a6ed4..4dd5b1c9275 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php @@ -39,11 +39,7 @@ public function __construct() $this->_formScripts[] = " function toggleEditor() { - if (tinyMCE.getInstanceById('block_content') == null) { - tinyMCE.execCommand('mceAddControl', false, 'block_content'); - } else { - tinyMCE.execCommand('mceRemoveControl', false, 'block_content'); - } + tinymce.execCommand('mceToggleEditor', false, wysiwygblock_content); } function saveAndContinueEdit(){ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index 6edfd2ef1bc..9c9018251c2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -105,11 +105,7 @@ protected function _prepareLayout() $this->_formScripts[] = " function toggleEditor() { - if (tinyMCE.getInstanceById('page_content') == null) { - tinyMCE.execCommand('mceAddControl', false, 'page_content'); - } else { - tinyMCE.execCommand('mceRemoveControl', false, 'page_content'); - } + tinymce.execCommand('mceToggleEditor', false, wysiwygpage_content); } function saveAndContinueEdit(urlTemplate) { diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php index 18c7a097843..16db0f41f59 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php @@ -79,7 +79,7 @@ public function getTreeArray($parentId = null, $asJson = false, $recursionLevel /** * Get categories collection * - * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Category_Collection + * @return Mage_Catalog_Model_Resource_Category_Collection */ public function getCategoryCollection() { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php index 58f9a854bc9..63a80cbbb4b 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Clone/Media/Image.php @@ -30,7 +30,7 @@ public function getPrefixes() // use cached eav config $entityTypeId = Mage::getSingleton('eav/config')->getEntityType(Mage_Catalog_Model_Product::ENTITY)->getId(); - /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Attribute_Collection $collection */ + /** @var Mage_Catalog_Model_Resource_Product_Attribute_Collection $collection */ $collection = Mage::getResourceModel('catalog/product_attribute_collection'); $collection->setEntityTypeFilter($entityTypeId); $collection->setFrontendInputTypeFilter('media_image'); diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Skin.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Skin.php new file mode 100644 index 00000000000..1dd4d86f1ed --- /dev/null +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Cms/Wysiwyg/Skin.php @@ -0,0 +1,44 @@ + 'oxide', + 'label' => 'Oxide' + ], + [ + 'value' => 'oxide-dark', + 'label' => 'Oxide Dark' + ], + [ + 'value' => 'tinymce-5', + 'label' => 'Tinymce 5' + ], + [ + 'value' => 'tinymce-5-dark', + 'label' => 'Tinymce 5 Dark' + ] + ]; + } +} diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml index ecc908bb664..046e822bade 100644 --- a/app/code/core/Mage/Adminhtml/etc/config.xml +++ b/app/code/core/Mage/Adminhtml/etc/config.xml @@ -28,7 +28,6 @@ Mage_Adminhtml_Model_Resource - adminhtml_mysql4 diff --git a/app/code/core/Mage/Api/Model/Mysql4/Acl.php b/app/code/core/Mage/Api/Model/Mysql4/Acl.php deleted file mode 100644 index 2346fd45f20..00000000000 --- a/app/code/core/Mage/Api/Model/Mysql4/Acl.php +++ /dev/null @@ -1,25 +0,0 @@ - Mage_Api_Model_Resource - api_mysql4 api_assert
diff --git a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php b/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php deleted file mode 100644 index 28038f2f5bb..00000000000 --- a/app/code/core/Mage/Bundle/Model/Mysql4/Bundle.php +++ /dev/null @@ -1,25 +0,0 @@ -getEvent()->getCollection(); $limit = $observer->getEvent()->getLimit(); if (is_array($limit)) { diff --git a/app/code/core/Mage/Bundle/etc/config.xml b/app/code/core/Mage/Bundle/etc/config.xml index 9bd44d8c713..ff6c690f282 100644 --- a/app/code/core/Mage/Bundle/etc/config.xml +++ b/app/code/core/Mage/Bundle/etc/config.xml @@ -28,7 +28,6 @@ Mage_Bundle_Model_Resource - bundle_mysql4