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

silverstripe · Apr 15, 2012 · 4718f14 · 4718f14
1 parent a0e320d
commit 4718f14
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/code/controllers/CMSMain.php b/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
 		);
 	}