mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge branch '3.0' into 3.1
This commit is contained in:
commit
b5725c7ace
@ -1332,27 +1332,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the version number of this application.
|
|
||||||
* Uses the subversion path information in <mymodule>/silverstripe_version
|
|
||||||
* (automacially replaced by build scripts).
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function CMSVersion() {
|
|
||||||
$cmsVersion = file_get_contents(CMS_PATH . '/silverstripe_version');
|
|
||||||
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",
|
|
||||||
$cmsVersion,
|
|
||||||
$frameworkVersion
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function providePermissions() {
|
public function providePermissions() {
|
||||||
$title = _t("CMSPagesController.MENUTITLE", LeftAndMain::menu_title_for_class('CMSPagesController'));
|
$title = _t("CMSPagesController.MENUTITLE", LeftAndMain::menu_title_for_class('CMSPagesController'));
|
||||||
return array(
|
return array(
|
||||||
|
Loading…
Reference in New Issue
Block a user