Merge remote-tracking branch 'origin/1.3' into 1.x

pimcore · Mar 5, 2024 · cd5cb36 · cd5cb36
2 parents fa2d03a + 3a91315
commit cd5cb36
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/public/js/pimcore/object/tags/localizedfields.js b/public/js/pimcore/object/tags/localizedfields.js
@@ -643,17 +643,19 @@ pimcore.object.tags.localizedfields = Class.create(pimcore.object.tags.abstract,
         for (var i = 0; i < this.frontendLanguages.length; i++) {
             var currentLanguage = this.frontendLanguages[i];
 
-            for (var s = 0; s < this.languageElements[currentLanguage].length; s++) {
-                if (this.metaData[currentLanguage]) {
-                    var languageElement = this.languageElements[currentLanguage][s];
-                    var key = languageElement.name;
-                    if (this.metaData[currentLanguage][key]) {
-                        if (this.metaData[currentLanguage][key].inherited) {
-                            if (languageElement.isDirty()) {
-                                this.metaData[currentLanguage][key].inherited = false;
-                                languageElement.unmarkInherited();
-                            } else {
-                                foundUnmodifiedInheritedField = true;
+            if (typeof this.languageElements[currentLanguage] !== "undefined") {
+                for (var s = 0; s < this.languageElements[currentLanguage].length; s++) {
+                    if (this.metaData[currentLanguage]) {
+                        var languageElement = this.languageElements[currentLanguage][s];
+                        var key = languageElement.name;
+                        if (this.metaData[currentLanguage][key]) {
+                            if (this.metaData[currentLanguage][key].inherited) {
+                                if (languageElement.isDirty()) {
+                                    this.metaData[currentLanguage][key].inherited = false;
+                                    languageElement.unmarkInherited();
+                                } else {
+                                    foundUnmodifiedInheritedField = true;
+                                }
                             }
                         }
                     }

diff --git a/public/js/pimcore/settings/thumbnail/item.js b/public/js/pimcore/settings/thumbnail/item.js
@@ -671,6 +671,9 @@ pimcore.settings.thumbnail.items = {
         if (typeof data == "undefined") {
             data = {};
         }
+        if (!data.positioning) {
+            data.positioning = 'center';
+        }
         var myId = Ext.id();
 
         var item = new Ext.form.FormPanel({

diff --git a/src/Controller/Admin/UserController.php b/src/Controller/Admin/UserController.php
@@ -1106,7 +1106,7 @@ public function invitationLinkAction(Request $request, TranslatorInterface $tran
                     $mail->send();
 
                     $success = true;
-                    $message = sprintf($translator->trans('invitation_link_sent', [], 'admin'), $user->getEmail());
+                    $message = sprintf($translator->trans('invitation_link_sent', [], 'admin_ext'), $user->getEmail());
                 } catch (\Exception $e) {
                     $message .= 'could not send email';
                 }