aboutsummaryrefslogtreecommitdiffstats
path: root/lib/setup.php
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-09-04 14:56:09 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-09-04 14:56:09 +0200
commit252bca505758eaf668a4b5416003569568b91465 (patch)
tree524af6a83f3d5afc2c361bc8cc059088031b1453 /lib/setup.php
parentf4b9895cbf71376559dd1eaadac813ded0737b13 (diff)
downloadnextcloud-server-252bca505758eaf668a4b5416003569568b91465.tar.gz
nextcloud-server-252bca505758eaf668a4b5416003569568b91465.zip
removed database table prefix choice, use oc_
Diffstat (limited to 'lib/setup.php')
-rw-r--r--lib/setup.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/setup.php b/lib/setup.php
index baaa2f70465..ebdf3ef823e 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -64,9 +64,6 @@ class OC_Setup {
if(empty($options['dbhost'])) {
$error[] = "$dbprettyname set the database host.";
}
- if(!isset($options['dbtableprefix'])) {
- $error[] = "$dbprettyname set a table prefix.";
- }
}
if(count($error) == 0) { //no errors, good
@@ -88,10 +85,10 @@ class OC_Setup {
$dbpass = $options['dbpass'];
$dbname = $options['dbname'];
$dbhost = $options['dbhost'];
- $dbtableprefix = $options['dbtableprefix'];
+ $dbtableprefix = 'oc_';
OC_Config::setValue('dbname', $dbname);
OC_Config::setValue('dbhost', $dbhost);
- OC_Config::setValue('dbtableprefix', $dbtableprefix);
+ OC_Config::setValue('dbtableprefix', 'oc_');
//check if the database user has admin right
$connection = @mysql_connect($dbhost, $dbuser, $dbpass);