diff --git a/lib/private/updater.php b/lib/private/updater.php index 9827d8a8c1..a1b07c5a24 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -58,6 +58,7 @@ class Updater extends BasicEmitter { $version['updated'] = \OC_Appconfig::getValue('core', 'lastupdatedat'); $version['updatechannel'] = \OC_Util::getChannel(); $version['edition'] = \OC_Util::getEditionString(); + $version['build'] = \OC_Util::getBuild(); $versionString = implode('x', $version); //fetch xml data from updater diff --git a/lib/private/util.php b/lib/private/util.php index 426c5a025f..b5c5546da3 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -1111,4 +1111,17 @@ class OC_Util { $t = explode('/', $file); return array_pop($t); } + + /** + * A human readable string is generated based on version, channel and build number + * @return string + */ + public static function getHumanVersion() { + $version = OC_Util::getVersionString().' ('.OC_Util::getChannel().')'; + $build = OC_Util::getBuild(); + if(!empty($build) and OC_Util::getChannel() === 'daily') { + $version .= ' Build:' . $build; + } + return $version; + } } diff --git a/settings/templates/admin.php b/settings/templates/admin.php index f655a14be8..253a7ff5f5 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -264,7 +264,7 @@ if (!$_['internetconnectionworking']) {

t('Version'));?>

- getTitle()); ?> + getTitle()); ?>

t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 9d21e18e73..2d8652aed7 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -167,7 +167,7 @@ if($_['passwordChangeSupported']) {

t('Version'));?>

- getName()); ?>
+ getName()); ?>
t('Developed by the ownCloud community, the source code is licensed under the AGPL.')); ?>