diff options
| author | Brice Maron <brice@bmaron.net> | 2011-10-16 21:06:48 +0200 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2011-10-16 21:06:48 +0200 |
| commit | c105268a1dc7e68bd9dc3ff3ebe65cffcce33568 (patch) | |
| tree | 657eba943c9eed70efe858b8a3cb4f680f7eed10 /lib/setup.php | |
| parent | 543537ef29bb6f0d9b93a5329e7443e6742452ab (diff) | |
| download | nextcloud-server-c105268a1dc7e68bd9dc3ff3ebe65cffcce33568.tar.gz nextcloud-server-c105268a1dc7e68bd9dc3ff3ebe65cffcce33568.zip | |
Fetch prefix from config at installation instead of a hardcoded value
Diffstat (limited to 'lib/setup.php')
| -rw-r--r-- | lib/setup.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/setup.php b/lib/setup.php index d13502c4adf..92487c69162 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -82,10 +82,10 @@ class OC_Setup { $dbpass = $options['dbpass']; $dbname = $options['dbname']; $dbhost = $options['dbhost']; - $dbtableprefix = 'oc_'; + $dbtableprefix = OC_Config::gsetValue('dbtableprefix','oc_'); OC_Config::setValue('dbname', $dbname); OC_Config::setValue('dbhost', $dbhost); - OC_Config::setValue('dbtableprefix', 'oc_'); + OC_Config::setValue('dbtableprefix', $dbtableprefix); //check if the database user has admin right $connection = @mysql_connect($dbhost, $dbuser, $dbpass); @@ -135,7 +135,7 @@ class OC_Setup { $dbpass = $options['dbpass']; $dbname = $options['dbname']; $dbhost = $options['dbhost']; - $dbtableprefix = 'oc_'; + $dbtableprefix = OC_Config::getValue('dbtableprefix','oc_'); OC_CONFIG::setValue('dbname', $dbname); OC_CONFIG::setValue('dbhost', $dbhost); OC_CONFIG::setValue('dbtableprefix', $dbtableprefix); |