Fix visual glitch when no language is found

DeuxHuitHuit · Oct 27, 2014 · fa146d0 · fa146d0
1 parent 099039a
commit fa146d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/extension.driver.php b/extension.driver.php
@@ -34,15 +34,15 @@ public function initializeAdmin($context) {
 		//language redirect cases
 		if ($codes == '' || $codes == null) $codes = Symphony::Configuration()->get('language_codes', 'language_redirect');
 		if ($codes == '' || $codes == null) $codes = Symphony::Configuration()->get('languages', 'language_redirect');
-		$languages = array_map('trim',explode(',', $codes ));
+		$languages = array_filter(array_map('trim',explode(',', $codes )));
 
 		// CSS & JS for all admin
 		$page->addStylesheetToHead($assets_path . '/language_switcher.css', 'all', $LOAD_NUMBER++);
 		$script = new XMLElement('script');
 		$script->setAttributeArray(array('type' => 'text/javascript'));
 		$script->setValue(sprintf(
 			"
-				Symphony.Languages = ['%s'];
+				Symphony.Languages = %s;
 				Symphony.Author = {
 					id : %d,
 					default_section : %d,
@@ -53,7 +53,7 @@ public function initializeAdmin($context) {
 					language : '%s'
 				};
 			",
-			implode("','", $languages),
+			empty($languages) ? '[]' : "['" . implode("','", $languages) . "']",
 			$author->get('id'),
 			$author->get('default_section'),
 			$author->get('email'),

diff --git a/extension.meta.xml b/extension.meta.xml
@@ -27,6 +27,9 @@
 		</author>
 	</authors>
 	<releases>
+		<release version="1.2.3" date="TBA" min="2.3.0" max="2.5.x">
+			* Fix visual glitch when no language is found
+		</release>
 		<release version="1.2.2" date="201-11-06" min="2.3.0" max="2.5.x">
 			* Minor update for 2.5.x
 		</release>