From f1fb0bf355fe3d5a44f789ee9eeed0fb1cdccd93 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 11 Jan 2017 21:20:08 +0100 Subject: [PATCH] removed obsolete copying --- lam/lib/upgrade.inc | 13 ------------- lam/templates/login.php | 2 -- 2 files changed, 15 deletions(-) diff --git a/lam/lib/upgrade.inc b/lam/lib/upgrade.inc index c8e0f762..ccb5975a 100644 --- a/lam/lib/upgrade.inc +++ b/lam/lib/upgrade.inc @@ -131,19 +131,6 @@ function upgradeConfigToServerProfileFolders($profiles) { recursiveDelete('../config/profiles', $profiles); } -/** - * Saves an hash array (attribute => value) to an account profile - * - * @param array $profiles server profiles - */ -function copyConfigTemplates($profiles) { - foreach ($profiles as $profile) { - // copy templates but do not override existing files - recursiveCopy('../config/templates/pdf/', '../config/pdf/' . $profile, $profiles, null, false); - recursiveCopy('../config/templates/profiles/', '../config/profiles/' . $profile, $profiles, null, false); - } -} - /** * Copy a file or recursively copy a directory * diff --git a/lam/templates/login.php b/lam/templates/login.php index f1e668b2..f28e0477 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -229,8 +229,6 @@ function display_LoginPage($config_object, $cfgMain) { StatusMessage('INFO', 'Config file migration finished.'); } } - // copy any missing default profiles - copyConfigTemplates($profiles); if (isLAMProVersion() && $licenseValidator->isEvaluationLicense()) { StatusMessage('INFO', _('Evaluation Licence'));