From 7dc3d62f3d9bf50f1b4936b01f7d794e9d6364e1 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 2 Jun 2011 23:42:06 +0000 Subject: [PATCH] smarty.inc.php: - replaced last usage of $CONF['postfix_admin_path'] with $incpath config.inc.php: - drop (now unused) $CONF['postfix_admin_path'] config variable git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1070 a1433add-5e2c-0410-b055-b7f2511e0802 --- config.inc.php | 3 --- smarty.inc.php | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config.inc.php b/config.inc.php index aa157499..2e4af6e6 100644 --- a/config.inc.php +++ b/config.inc.php @@ -34,9 +34,6 @@ $CONF['setup_password'] = 'changeme'; // YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin $CONF['postfix_admin_url'] = ''; -// shouldn't need changing. -$CONF['postfix_admin_path'] = dirname(__FILE__); - // Language config // Language files are located in './languages', change as required.. $CONF['default_language'] = 'en'; diff --git a/smarty.inc.php b/smarty.inc.php index 5a1d818f..c077514a 100644 --- a/smarty.inc.php +++ b/smarty.inc.php @@ -71,7 +71,7 @@ if (authentication_has_role('global-admin')) { $motd_file = "motd.txt"; } $smarty->assign('motd_file', ''); -if (file_exists ($CONF ['postfix_admin_path'].'/templates/'.$motd_file)) { +if (file_exists ($incpath.'/templates/'.$motd_file)) { $smarty->assign ('motd_file', $motd_file); }