From 4718f14eccd360062a469a9c9822cfbfaef1c9f2 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Sun, 15 Apr 2012 14:56:45 +1200 Subject: [PATCH] MINOR: look for framework version in framework path rather than CMS path --- code/controllers/CMSMain.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 287a23f2..6fb37ab9 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -1164,13 +1164,15 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr */ public function CMSVersion() { $cmsVersion = file_get_contents(CMS_PATH . '/silverstripe_version'); - if(!$cmsVersion) $cmsVersion = _t('LeftAndMain.VersionUnknown'); - $sapphireVersion = file_get_contents(CMS_PATH . '/silverstripe_version'); - if(!$sapphireVersion) $sapphireVersion = _t('LeftAndMain.VersionUnknown'); + if(!$cmsVersion) $cmsVersion = _t('LeftAndMain.VersionUnknown', 'Unknown'); + + $frameworkVersion = file_get_contents(FRAMEWORK_PATH . '/silverstripe_version'); + if(!$frameworkVersion) $frameworkVersion = _t('LeftAndMain.VersionUnknown', 'Unknown'); + return sprintf( - "cms: %s, framework: %s", + "CMS: %s Framework: %s", $cmsVersion, - $sapphireVersion + $frameworkVersion ); }