Merge branch 'main' into jquery

# Conflicts:
#	composer.lock

Author: sreichel

.gitignore

@@ -27,7 +27,7 @@
 /js/lib/jquery/jquery*
 
 # TinyMCE library
-/js/tinymce
+/js/lib/tinymce
 
 # Add development environment setup files and README
 # https://github.com/OpenMage/magento-lts/pull/1012

app/design/adminhtml/default/default/template/page/head.phtml

@@ -41,7 +41,7 @@
 <?php endif ?>
 
 <?php if ($this->getCanLoadTinyMce()): // TinyMCE is broken when loaded through index.php?>
-<script type="text/javascript" src="<?php echo $this->getJsUrl() ?>tinymce/tinymce.min.js"></script>
+<script type="text/javascript" src="<?php echo $this->getJsUrl('lib/tinymce/tinymce.min.js') ?>"></script>
 <?php endif ?>
 
 <script type="text/javascript">

app/design/adminhtml/default/default/template/widget/form/element.phtml

@@ -67,7 +67,7 @@
     case 'wysiwyg': ?>
     <span class="form_row">
       <label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label>
-        <script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>tinymce/tinymce.min.js"></script>
+        <script type="text/javascript" src="<?php echo Mage::getBaseUrl('js') ?>lib/tinymce/tinymce.min.js"></script>
         <script type="text/javascript">
         //<![CDATA[
         tinyMCE.init({