Merge branch 'master' into sharing

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/filestorage.php b/lib/filestorage.php
index c2614dc5dcf..95e8c31eff2 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -56,6 +56,7 @@ class OC_FILESTORAGE{
 	public function hash($type,$path,$raw){}
 	public function free_space($path){}
 	public function search($query){}
+	public function getLocalFile($path){}// get a path to a local version of the file, whether the original file is local or remote
 }
 
 
@@ -376,6 +377,9 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
 	public function search($query){
 		return $this->searchInDir($query);
 	}
+	public function getLocalFile($path){
+			return $this->datadir.$path;
+	}
 	
 	private function searchInDir($query,$dir=''){
 		$files=array();
diff --git a/lib/setup.php b/lib/setup.php
index 1a33209ec57..63ba4daab54 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -131,7 +131,9 @@ class OC_SETUP {
 			}
 			else {
 				//delete the old sqlite database first, might cause infinte loops otherwise
-				unlink("$datadir/owncloud.db");
+				if(file_exists("$datadir/owncloud.db")){
+					unlink("$datadir/owncloud.db");
+				}
 				//in case of sqlite, we can always fill the database
 				OC_DB::createDbFromStructure('db_structure.xml');
 			}