[Pkg-owncloud-commits] [owncloud] 19/75: Fetch prefix from config at installation instead of a hardcoded value

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v3.0.1
in repository owncloud.

commit 32befb4fe074ee646929fc1855e234e0e055ba66
Author: Brice Maron <brice at bmaron.net>
Date:   Sun Oct 16 21:06:48 2011 +0200

    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 071108a..a6730a8 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git