Skip to content
Snippets Groups Projects
Commit 7b3ae2ed authored by Robin Appelman's avatar Robin Appelman
Browse files

use database table prefix from installer, not the old configured value

parent 13d2c5e9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
lib/setup.php
+ 2
− 2
View file @ 7b3ae2ed
...@@ -82,7 +82,7 @@ class OC_Setup { ...@@ -82,7 +82,7 @@ class OC_Setup {
$dbpass = $options['dbpass']; $dbpass = $options['dbpass'];
$dbname = $options['dbname']; $dbname = $options['dbname'];
$dbhost = $options['dbhost']; $dbhost = $options['dbhost'];
$dbtableprefix = OC_Config::getValue('dbtableprefix','oc_'); $dbtableprefix = $options['dbtableprefix'];
OC_Config::setValue('dbname', $dbname); OC_Config::setValue('dbname', $dbname);
OC_Config::setValue('dbhost', $dbhost); OC_Config::setValue('dbhost', $dbhost);
OC_Config::setValue('dbtableprefix', $dbtableprefix); OC_Config::setValue('dbtableprefix', $dbtableprefix);
...@@ -135,7 +135,7 @@ class OC_Setup { ...@@ -135,7 +135,7 @@ class OC_Setup {
$dbpass = $options['dbpass']; $dbpass = $options['dbpass'];
$dbname = $options['dbname']; $dbname = $options['dbname'];
$dbhost = $options['dbhost']; $dbhost = $options['dbhost'];
$dbtableprefix = OC_Config::getValue('dbtableprefix','oc_'); $dbtableprefix = $options['dbtableprefix'];
OC_CONFIG::setValue('dbname', $dbname); OC_CONFIG::setValue('dbname', $dbname);
OC_CONFIG::setValue('dbhost', $dbhost); OC_CONFIG::setValue('dbhost', $dbhost);
OC_CONFIG::setValue('dbtableprefix', $dbtableprefix); OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment