summaryrefslogtreecommitdiffstats
path: root/lib/setup.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind1991@gmail.com>2011-10-30 15:40:42 +0100
committerRobin Appelman <icewind1991@gmail.com>2011-11-03 13:09:51 +0100
commit7b3ae2edd405f31071f43f941615c9da6dd1536e (patch)
treecda5e20b43511b8b52a86cb2addbaa112f1031b5 /lib/setup.php
parent13d2c5e926e71a1ef2ef0bce96eb5a6f627cf88f (diff)
downloadnextcloud-server-7b3ae2edd405f31071f43f941615c9da6dd1536e.tar.gz
nextcloud-server-7b3ae2edd405f31071f43f941615c9da6dd1536e.zip
use database table prefix from installer, not the old configured value
Diffstat (limited to 'lib/setup.php')
-rw-r--r--lib/setup.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/setup.php b/lib/setup.php
index 2dcedb9b820..e2d56ddaf4a 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -82,7 +82,7 @@ class OC_Setup {
$dbpass = $options['dbpass'];
$dbname = $options['dbname'];
$dbhost = $options['dbhost'];
- $dbtableprefix = OC_Config::getValue('dbtableprefix','oc_');
+ $dbtableprefix = $options['dbtableprefix'];
OC_Config::setValue('dbname', $dbname);
OC_Config::setValue('dbhost', $dbhost);
OC_Config::setValue('dbtableprefix', $dbtableprefix);
@@ -135,7 +135,7 @@ class OC_Setup {
$dbpass = $options['dbpass'];
$dbname = $options['dbname'];
$dbhost = $options['dbhost'];
- $dbtableprefix = OC_Config::getValue('dbtableprefix','oc_');
+ $dbtableprefix = $options['dbtableprefix'];
OC_CONFIG::setValue('dbname', $dbname);
OC_CONFIG::setValue('dbhost', $dbhost);
OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);