update

microweber · Apr 24, 2024 · 6d6a71b · 6d6a71b
1 parent b2a7645
commit 6d6a71b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/MicroweberPackages/Content/ContentManagerHelpers.php b/src/MicroweberPackages/Content/ContentManagerHelpers.php
@@ -713,17 +713,26 @@ public function save_from_live_edit($post_data)
             $ref_page_url = xss_clean($ref_page_url);
 
         }
-        //dd($ref_page_url,$post_data);
-        $multilanguageIsActive = MultilanguageHelpers::multilanguageIsEnabled();
+
+
+
+         $multilanguageIsActive = MultilanguageHelpers::multilanguageIsEnabled();
 
         if ($multilanguageIsActive) {
             $lang_from_url = detect_lang_from_url($ref_page_url);
-            if (isset($lang_from_url['target_locale'])
+            if (isset($post_data['lang'])
+                and ($post_data['lang'])
+            ) {
+
+                change_language_by_locale($post_data['lang'] ,true);
+            } else if (isset($lang_from_url['target_locale'])
                 and isset($lang_from_url['target_locale'])
             ) {
 
-                change_language_by_locale($lang_from_url['target_locale']);
+                change_language_by_locale($lang_from_url['target_locale'],true);
             }
+
+
         }
 
 

diff --git a/src/MicroweberPackages/LiveEdit/resources/js/ui/live-edit-page-scripts.js b/src/MicroweberPackages/LiveEdit/resources/js/ui/live-edit-page-scripts.js
@@ -43,11 +43,17 @@ if(window.self !== window.top) {
             /************  START base64  ************/
             data.from_url = window.location.href;
 
-            //sometimes the url can be modified by pop state, so we use iframedata original url
+
             if(typeof mw.liveEditIframeData !== 'undefined'){
+                //sometimes the url can be modified by pop state, so we use iframedata original url
                 if(typeof mw.liveEditIframeData.content_link !== 'undefined'){
                     data.from_url =  mw.liveEditIframeData.content_link;
                 }
+
+                //sometimes the lang can be modified from another tab, so we use iframedata original lang
+                if(typeof mw.liveEditIframeData.multiLanguageCurrentLanguage !== 'undefined'){
+                    data.lang = mw.liveEditIframeData.multiLanguageCurrentLanguage;
+                 }
             }