From 6affa3281a4965d233783a26935bc842633d30dd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 17 Apr 2011 13:02:36 +0200
Subject: [PATCH 1/2] small fixes in webdav

---
 files/webdav.php                      | 1 -
 lib/HTTP/WebDAV/Server/Filesystem.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/files/webdav.php b/files/webdav.php
index 4b1393c110b..a6e0d256551 100644
--- a/files/webdav.php
+++ b/files/webdav.php
@@ -41,7 +41,6 @@ $passwd=$_SERVER['PHP_AUTH_PW'];
 if(OC_USER::login($user,$passwd)){
 	OC_UTIL::setUpFS();
 	$server = new HTTP_WebDAV_Server_Filesystem();
-	$server->db_name = $CONFIG_DBNAME;
 	$server->ServeRequest($CONFIG_DATADIRECTORY);
 
 }else{
diff --git a/lib/HTTP/WebDAV/Server/Filesystem.php b/lib/HTTP/WebDAV/Server/Filesystem.php
index 1c1dbdb5fb7..49b2397175a 100644
--- a/lib/HTTP/WebDAV/Server/Filesystem.php
+++ b/lib/HTTP/WebDAV/Server/Filesystem.php
@@ -410,7 +410,7 @@
             OC_FILESYSTEM::unlink($path);
         }
             $query = OC_DB::prepare("DELETE FROM *PREFIX*properties WHERE path = ?");
-            $query->execute(array($options[path]));
+            $query->execute(array($options['path']));
 
         return "204 No Content";
     }

From a8f823fc7fd93c2f343d0597ed848b2b03735de5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Sun, 17 Apr 2011 13:33:22 +0200
Subject: [PATCH 2/2] fix installation template

---
 templates/installation.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/installation.php b/templates/installation.php
index 6e555e843f2..ca4ea0e5d24 100644
--- a/templates/installation.php
+++ b/templates/installation.php
@@ -27,10 +27,12 @@
 					<p><label class="left">Database</label></p>
 					<p><input type="radio" name="dbtype" value='sqlite' id="sqlite" checked="checked" /><label for="sqlite">SQLite</label>
 					<input type="radio" name="dbtype" value='mysql' id="mysql"><label for="mysql">MySQL</label></p>
+				<?php endif;?>
+				<?php if($_['hasMySQL']): ?>
 					<div id="use_mysql">
-						<p><input type="text" name="dbuser" value="admin / username" /></p>
-						<p><input type="password" name="dbpass" value="password" /></p>
-						<p><input type="text" name="dbname" value="database name" /></p>
+					<p><input type="text" name="dbuser" value="admin / username" /></p>
+					<p><input type="password" name="dbpass" value="password" /></p>
+					<p><input type="text" name="dbname" value="database name" /></p>
 				<?php endif;?>
 				<?php if($_['hasMySQL'] and !$_['hasSQLite']): ?>
 					<input type='hidden' name='dbtype' value='mysql'/>