Merge branch '4.1' into 4.2

silverstripe · Aug 15, 2019 · e2a5788 · e2a5788
2 parents 6d47014 + 8459f47
commit e2a5788
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/boot/registerTransforms.js b/client/src/boot/registerTransforms.js
@@ -75,8 +75,8 @@ export default () => {
   // Add elemental editor actions
   Injector.transform('element-actions', (updater) => {
     updater.component('ElementActions', SaveAction, 'ElementActionsWithSave');
-    updater.component('ElementActions', ArchiveAction, 'ElementActionsWithArchive');
     updater.component('ElementActions', PublishAction, 'ElementActionsWithPublish');
     updater.component('ElementActions', UnpublishAction, 'ElementActionsWithUnpublish');
+    updater.component('ElementActions', ArchiveAction, 'ElementActionsWithArchive');
   });
 };
diff --git a/src/Forms/EditFormFactory.php b/src/Forms/EditFormFactory.php
@@ -40,14 +40,6 @@ protected function getFormFields(RequestHandler $controller = null, $name, $cont
         $editorField = $fields->fieldByName('Root.Main.HTML');
         if ($editorField) {
             $editorField->setRows(7);
-
-            $editorConfig = $editorField->getEditorConfig();
-
-            // Only configure if the editor is TinyMCE
-            if ($editorConfig instanceof TinyMCEConfig) {
-                $editorConfig->setOption('statusbar', false);
-                $editorField->setEditorConfig($editorConfig);
-            }
         }
 
         return $fields;