diff options
| -rw-r--r-- | core/templates/update.admin.php | 5 | ||||
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | lib/private/server.php | 13 |
3 files changed, 21 insertions, 0 deletions
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index 75815de84bc..543820e054f 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -34,6 +34,11 @@ <div class="infogroup bold"> <?php p($l->t('Please make sure that the database, the config folder and the data folder have been backed up before proceeding.')) ?> </div> + <?php foreach ($_['releaseNotes'] as $note): ?> + <div class="infogroup bold"> + <?php p($note) ?> + </div> + <?php endforeach; ?> <input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>"> <div class="infogroup"> <?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?> diff --git a/lib/base.php b/lib/base.php index 35c8592fe10..a5b0dd429ae 100644 --- a/lib/base.php +++ b/lib/base.php @@ -392,12 +392,15 @@ class OC { $tmpl->assign('isAppsOnlyUpgrade', false); } + $releaseNotes = \OC::$server->getReleaseNotes(); + // get third party apps $ocVersion = \OCP\Util::getVersion(); $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion)); $tmpl->assign('incompatibleAppsList', $appManager->getIncompatibleApps($ocVersion)); $tmpl->assign('productName', 'ownCloud'); // for now $tmpl->assign('oldTheme', $oldTheme); + $tmpl->assign('releaseNotes', $releaseNotes->getReleaseNotes($installedVersion, $currentVersion)); $tmpl->printPage(); } diff --git a/lib/private/server.php b/lib/private/server.php index 581a2b44cea..00ee4e5c565 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -623,6 +623,12 @@ class Server extends ServerContainer implements IServerContainer { return $manager; }); + + $this->registerService('ReleaseNotes', function (Server $c) { + return new \OC\ReleaseNotes( + $c->getDatabaseConnection() + ); + }); } /** @@ -1276,4 +1282,11 @@ class Server extends ServerContainer implements IServerContainer { return $this->query('ShareManager'); } + /** + * @return \OC\ReleaseNotes + */ + public function getReleaseNotes() { + return $this->query('ReleaseNotes'); + } + } |