diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-04-17 13:33:38 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-04-17 13:33:38 +0200 |
| commit | 7fbcafdda445482309ba9b2fde05fa1b5b4f92d1 (patch) | |
| tree | 41397515e096de6f5bee10cecf5d9f1e6c6bd920 | |
| parent | 793c507af2015afab351c7399768e226885c749d (diff) | |
| parent | a8f823fc7fd93c2f343d0597ed848b2b03735de5 (diff) | |
| download | nextcloud-server-7fbcafdda445482309ba9b2fde05fa1b5b4f92d1.tar.gz nextcloud-server-7fbcafdda445482309ba9b2fde05fa1b5b4f92d1.zip | |
Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
| -rw-r--r-- | files/webdav.php | 1 | ||||
| -rw-r--r-- | lib/HTTP/WebDAV/Server/Filesystem.php | 2 | ||||
| -rw-r--r-- | templates/installation.php | 8 |
3 files changed, 6 insertions, 5 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"; } 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'/> |