From 1098835a2249bdc9746f305dcd4a89a691601467 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 12 Aug 2017 16:29:17 +0200
Subject: [PATCH] Fix language chooser when editing multiple media files one
 after another

---
 com.woltlab.wcf/templates/languageChooser.tpl               | 6 +++---
 wcfsetup/install/files/acp/templates/languageChooser.tpl    | 6 +++---
 wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/com.woltlab.wcf/templates/languageChooser.tpl b/com.woltlab.wcf/templates/languageChooser.tpl
index cc72886b5b..c89eec9252 100644
--- a/com.woltlab.wcf/templates/languageChooser.tpl
+++ b/com.woltlab.wcf/templates/languageChooser.tpl
@@ -2,11 +2,11 @@
 {if !$label|isset}{assign var='label' value='wcf.user.language'}{/if}
 
 {if $languages|count}
-	<dl{if $errorField|isset && $errorField == 'languageID'} class="formError"{/if}>
+	<dl{if $errorField|isset && $errorField == $__languageChooserPrefix|concat:'languageID'} class="formError"{/if}>
 		<dt>{lang}{$label}{/lang}</dt>
 		<dd id="{@$__languageChooserPrefix}languageIDContainer">
 			<noscript>
-				<select name="languageID" id="languageID">
+				<select name="{@$__languageChooserPrefix}languageID" id="{@$__languageChooserPrefix}languageID">
 					{foreach from=$languages item=_language}
 						<option value="{@$_language->languageID}">{$_language}</option>
 					{/foreach}
@@ -26,7 +26,7 @@
 				{/implode}
 			};
 			
-			LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', 'languageID', {$languageID}, languages)
+			LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', '{@$__languageChooserPrefix}languageID', {$languageID}, languages)
 		});
 	</script>
 {/if}
diff --git a/wcfsetup/install/files/acp/templates/languageChooser.tpl b/wcfsetup/install/files/acp/templates/languageChooser.tpl
index cc72886b5b..c89eec9252 100644
--- a/wcfsetup/install/files/acp/templates/languageChooser.tpl
+++ b/wcfsetup/install/files/acp/templates/languageChooser.tpl
@@ -2,11 +2,11 @@
 {if !$label|isset}{assign var='label' value='wcf.user.language'}{/if}
 
 {if $languages|count}
-	<dl{if $errorField|isset && $errorField == 'languageID'} class="formError"{/if}>
+	<dl{if $errorField|isset && $errorField == $__languageChooserPrefix|concat:'languageID'} class="formError"{/if}>
 		<dt>{lang}{$label}{/lang}</dt>
 		<dd id="{@$__languageChooserPrefix}languageIDContainer">
 			<noscript>
-				<select name="languageID" id="languageID">
+				<select name="{@$__languageChooserPrefix}languageID" id="{@$__languageChooserPrefix}languageID">
 					{foreach from=$languages item=_language}
 						<option value="{@$_language->languageID}">{$_language}</option>
 					{/foreach}
@@ -26,7 +26,7 @@
 				{/implode}
 			};
 			
-			LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', 'languageID', {$languageID}, languages)
+			LanguageChooser.init('{@$__languageChooserPrefix}languageIDContainer', '{@$__languageChooserPrefix}languageID', {$languageID}, languages)
 		});
 	</script>
 {/if}
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
index 5f048352ae..7eb41a9058 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Editor.js
@@ -111,7 +111,7 @@ define(
 			
 			if (this._availableLanguageCount > 1) {
 				this._media.isMultilingual = ~~elBySel('input[name=isMultilingual]', content).checked;
-				this._media.languageID = this._media.isMultilingual ? null : LanguageChooser.getLanguageId('languageID');
+				this._media.languageID = this._media.isMultilingual ? null : LanguageChooser.getLanguageId('mediaEditor_' + this._media.mediaID + '_languageID');
 			}
 			else {
 				this._media.languageID = LANGUAGE_ID;
@@ -264,7 +264,7 @@ define(
 									// make sure that the language chooser is initialized first
 									setTimeout(function() {
 										if (this._availableLanguageCount > 1) {
-											LanguageChooser.setLanguageId('languageID', this._media.languageID || LANGUAGE_ID);
+											LanguageChooser.setLanguageId('mediaEditor_' + this._media.mediaID + '_languageID', this._media.languageID || LANGUAGE_ID);
 										}
 										
 										var title = elBySel('input[name=title]', content);
-- 
2.20.1