From c105268a1dc7e68bd9dc3ff3ebe65cffcce33568 Mon Sep 17 00:00:00 2001 From: Brice Maron Date: Sun, 16 Oct 2011 21:06:48 +0200 Subject: [PATCH] Fetch prefix from config at installation instead of a hardcoded value --- lib/setup.php | 6 +++--- 1 file 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);