tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: look for framework version in framework path rather than CMS path

Browse Source
This commit is contained in:
Will Rossiter 2012-04-15 14:56:45 +12:00
parent a0e320d9f2
commit 4718f14ecc
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/controllers/CMSMain.php
View File

@ -1164,13 +1164,15 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
*/ */
public function CMSVersion() { public function CMSVersion() {
$cmsVersion = file_get_contents(CMS_PATH . '/silverstripe_version'); $cmsVersion = file_get_contents(CMS_PATH . '/silverstripe_version');
if(!$cmsVersion) $cmsVersion = _t('LeftAndMain.VersionUnknown'); if(!$cmsVersion) $cmsVersion = _t('LeftAndMain.VersionUnknown', 'Unknown');
$sapphireVersion = file_get_contents(CMS_PATH . '/silverstripe_version');
if(!$sapphireVersion) $sapphireVersion = _t('LeftAndMain.VersionUnknown'); $frameworkVersion = file_get_contents(FRAMEWORK_PATH . '/silverstripe_version');
if(!$frameworkVersion) $frameworkVersion = _t('LeftAndMain.VersionUnknown', 'Unknown');
return sprintf( return sprintf(
"cms: %s, framework: %s", "CMS: %s Framework: %s",
$cmsVersion, $cmsVersion,
$sapphireVersion $frameworkVersion
); );
} }