summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-21 14:43:27 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-21 14:43:27 +0200
commit1060be0886c8f75c7bd0730897119583a5b11a73 (patch)
tree367c7ac7497ae315523a799c3dc69dcb63232d81
parent33144a5d806bbb01208588b7eaed69c1739e9839 (diff)
parentee42e9d489415f0fdd49c73ccafd4967fa95d40e (diff)
downloadnextcloud-server-1060be0886c8f75c7bd0730897119583a5b11a73.tar.gz
nextcloud-server-1060be0886c8f75c7bd0730897119583a5b11a73.zip
Merge pull request #19927 from owncloud/install-shipped-apps-on-upgrade
Install new shipped apps on upgrade
-rw-r--r--apps/dav/appinfo/info.xml1
-rw-r--r--lib/private/updater.php3
-rw-r--r--version.php2
3 files changed, 5 insertions, 1 deletions
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index c80af15a29b..38878ec27f2 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,6 +5,7 @@
<description>ownCloud WebDAV endpoint</description>
<licence>AGPL</licence>
<author>owncloud.org</author>
+ <version>0.1</version>
<requiremin>9.0</requiremin>
<shipped>true</shipped>
<standalone/>
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 70d68863788..c18b8fb4bc8 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -315,6 +315,9 @@ class Updater extends BasicEmitter {
if ($this->updateStepEnabled) {
$this->doCoreUpgrade();
+ // install new shipped apps on upgrade
+ OC_Installer::installShippedApps();
+
// update all shipped apps
$disabledApps = $this->checkAppsRequirements();
$this->doAppUpgrade();
diff --git a/version.php b/version.php
index cc5a18b1cb3..008bb7dafc6 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version = array(9, 0, 0, 0);
+$OC_Version = array(9, 0, 0, 1);
// The human readable string
$OC_VersionString = '9.0 pre alpha';