diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-24 12:53:55 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-24 12:53:55 +0100 |
| commit | 0d78d9c180fe4d08500d74c5c61e43c8b6862262 (patch) | |
| tree | 0e1b863431640154e99d70ea876ed6cd9a0d7a9d /lib/private/setup.php | |
| parent | a40cedf507a432c0f2afc144fbc3c7dedb438852 (diff) | |
| parent | 11ca01403408413cbbe48c8d78c41802998868b7 (diff) | |
| download | nextcloud-server-0d78d9c180fe4d08500d74c5c61e43c8b6862262.tar.gz nextcloud-server-0d78d9c180fe4d08500d74c5c61e43c8b6862262.zip | |
Merge branch 'master' into McNetic-zipstreamer
Conflicts:
3rdparty
Diffstat (limited to 'lib/private/setup.php')
| -rw-r--r-- | lib/private/setup.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php index 17ef75bc7b5..3906204bda3 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -65,6 +65,7 @@ class OC_Setup { OC_Config::setValue('passwordsalt', $salt); //write the config file + OC_Config::setValue('trusted_domains', array(OC_Request::serverHost())); OC_Config::setValue('datadirectory', $datadir); OC_Config::setValue('dbtype', $dbtype); OC_Config::setValue('version', implode('.', OC_Util::getVersion())); @@ -97,8 +98,6 @@ class OC_Setup { $appConfig = \OC::$server->getAppConfig(); $appConfig->setValue('core', 'installedat', microtime(true)); $appConfig->setValue('core', 'lastupdatedat', microtime(true)); - $appConfig->setValue('core', 'remote_core.css', '/core/minimizer.php'); - $appConfig->setValue('core', 'remote_core.js', '/core/minimizer.php'); OC_Group::createGroup('admin'); OC_Group::addToGroup($username, 'admin'); |