From f5037c30ea2184590e09ac09eab77fa601a981b9 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 4 Jun 2013 01:42:50 +0000 Subject: [PATCH] GenCode: * Remove shell_exec dependency. * In the web footer, report the same version number used everywhere else --- xml/GenCode.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/xml/GenCode.php b/xml/GenCode.php index bd7d8879c8..582a0fffe7 100644 --- a/xml/GenCode.php +++ b/xml/GenCode.php @@ -141,7 +141,7 @@ Alternatively you can get a version of CiviCRM that matches your PHP version exit(); } - $this->generateTemplateVersion($argVersion); + $this->generateTemplateVersion($db_version); $this->setupCms($argCms, $db_version); @@ -355,16 +355,8 @@ Alternatively you can get a version of CiviCRM that matches your PHP version $this->beautifier->save(); } - function generateTemplateVersion($argVersion) { - // add the Subversion revision to templates - // use svnversion if the version was not specified explicitely on the commandline - if (isset($argVersion) and $argVersion != '') { - $svnversion = $argVersion; - } - else { - $svnversion = `svnversion .`; - } - file_put_contents($this->tplCodePath . "/CRM/common/version.tpl", $svnversion); + function generateTemplateVersion($dbVersion) { + file_put_contents($this->tplCodePath . "/CRM/common/version.tpl", $dbVersion); } function findLocales() { -- 2.25.1