Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 4718f14eccd360062a469a9c9822cfbfaef1c9f2 1 parent a0e320d
@wilr wilr authored
Showing with 7 additions and 5 deletions.
  1. +7 −5 code/controllers/CMSMain.php
View
12 code/controllers/CMSMain.php
@@ -1164,13 +1164,15 @@ function duplicatewithchildren($request) {
*/
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
);
}
Please sign in to comment.
Something went wrong with that request. Please try again.