From 8677e600a4bc2129edbaf8e0a9db9bb2cd44be02 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 10 Jun 2015 15:53:21 +0000 Subject: [PATCH] Reset bootstrap to use config/version variables --- web/api/app/Config/bootstrap.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/api/app/Config/bootstrap.php b/web/api/app/Config/bootstrap.php index e86c35fd7..3a0981dd3 100644 --- a/web/api/app/Config/bootstrap.php +++ b/web/api/app/Config/bootstrap.php @@ -107,8 +107,8 @@ CakeLog::config('error', array( 'file' => 'error', )); -Configure::write('ZM_CONFIG', '/etc/zm.conf'); -Configure::write('ZM_VERSION', '1.28.0'); +Configure::write('ZM_CONFIG', '@ZM_CONFIG@'); +Configure::write('ZM_VERSION', '@VERSION@'); loadConfigFile();