Force unix linebreaks when a language file gets imported which has windows linebreaks inside.

tbrehm · tbrehm · commit 1445ad2b00dc · 2011-06-30T20:08:22.000Z
diff --git a/interface/web/admin/language_import.php b/interface/web/admin/language_import.php
@@ -84,7 +84,7 @@
 						$langfile_path = trim(ISPC_WEB_PATH.'/'.$module_name.'/lib/lang/'.$file_name);
 					}
 				} else {
-					$buffer .= $line;
+					$buffer .= trim($line)."\n";
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`$langfile_path = trim(ISPC_WEB_PATH.'/'.$module_name.'/lib/lang/'.$file_name);`
`85`	`85`	`}`
`86`	`86`	`} else {`
`87`		`- $buffer .= $line;`
	`87`	`+ $buffer .= trim($line)."\n";`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`