From f2a9b2faec10094514c16ea2c3539f910dc2bc62 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Sep 2013 05:26:33 -0400
Subject: [PATCH] - Added warning message to language import script. - Added switch to disable import function in config.inc.php - Merged language files.

---
 install/dist/lib/gentoo.lib.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 382689c..07a535b 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -725,6 +725,7 @@
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
 		$content = str_replace('{theme}', $conf['theme'], $content);
+		$content = str_replace('{language_file_import_enabled}', $conf['language_file_import_enabled'], $content);
 		
 		$this->write_config_file("$install_dir/interface/lib/$configfile", $content);
 		

--
Gitblit v1.9.1