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/lib/installer_base.lib.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 47f26c7..058ca5c 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1693,6 +1693,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);
wf($install_dir.'/interface/lib/'.$configfile, $content);
@@ -1717,6 +1718,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);
wf($install_dir.'/server/lib/'.$configfile, $content);
--
Gitblit v1.9.1