diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-02 08:48:37 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-02 08:48:37 +0200 |
| commit | 7086c386fdd1cfcec0ddc0db19615bd4586bade3 (patch) | |
| tree | 26d7a890bc0350af5260bb7a3736610e533e6d3b /lib/private/setup.php | |
| parent | 229e3dcba86db3bd91bbddd78079bf340edff710 (diff) | |
| parent | 73dd5ff26c2d7652fd4abacbac53d734f64fde96 (diff) | |
| download | nextcloud-server-7086c386fdd1cfcec0ddc0db19615bd4586bade3.tar.gz nextcloud-server-7086c386fdd1cfcec0ddc0db19615bd4586bade3.zip | |
Merge branch 'master' into append-error-document
Conflicts:
lib/private/setup.php
lib/private/updater.php
Diffstat (limited to 'lib/private/setup.php')
| -rw-r--r-- | lib/private/setup.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php index 65f295ee347..4889f603332 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -106,6 +106,10 @@ class OC_Setup { //guess what this does OC_Installer::installShippedApps(); + // create empty file in data dir, so we can later find + // out that this is indeed an ownCloud data directory + file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.ocdata', ''); + // Update htaccess files for apache hosts if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { self::updateHtaccess(); |