]> source.dussan.org Git - nextcloud-server.git/commitdiff
Do not use table perfix for sqlite
authorRobin Appelman <icewind1991@gmail.com>
Mon, 5 Jul 2010 13:31:59 +0000 (15:31 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Mon, 5 Jul 2010 13:31:59 +0000 (15:31 +0200)
inc/lib_config.php
inc/templates/adminform.php

index dad2fbf81599972f917987b13e53aebfd5249bd9..77fd68a189e2fac4340f20a2650fba276e568eab 100755 (executable)
@@ -186,11 +186,13 @@ class OC_CONFIG{
                                                //create/fill database
                                                $CONFIG_DBTYPE=$dbtype;
                                                $CONFIG_DBNAME=$_POST['dbname'];
-                                               $CONFIG_DBTABLEPREFIX=$_POST['dbtableprefix'];
                                                if($dbtype!='sqlite'){
+                                                       $CONFIG_DBTABLEPREFIX=$_POST['dbtableprefix'];
                                                        $CONFIG_DBHOST=$_POST['dbhost'];
                                                        $CONFIG_DBUSER=$_POST['dbuser'];
                                                        $CONFIG_DBPASSWORD=$_POST['dbpassword'];
+                                               }else{
+                                                       $_POST['dbtableprefix']='';
                                                }
                                                try{
                                                        if(isset($_POST['createdatabase']) and $CONFIG_DBTYPE!='sqlite'){
index 3adbd04ee7306f3ad2d9b53ed794ddac987eabc3..b962ac6f31b542fe86479c65a48426446525f6fa 100755 (executable)
@@ -28,7 +28,7 @@ function showBackupPath(){
 function dbtypechange(){
     var dropdown=action=document.getElementById('dbtype');
     var type=dropdown.options[dropdown.selectedIndex].value;
-    var inputs=Array('dbhost','dbuser','dbpass','dbpass_retype','dbcreaterow','dbAdminPwd','dbAdminUser','dbname','dbfill');
+    var inputs=Array('dbhost','dbuser','dbpass','dbpass_retype','dbcreaterow','dbAdminPwd','dbAdminUser','dbname','dbfill','dbtableprefix');
     var id,element;
     if(type=='sqlite'){
         for(i in inputs){