From d7ed456f965a8fbc3cf44ebf026f6f828cca2242 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Jan 2012 14:36:11 +0100
Subject: [PATCH] forgot to merge something
---
lib/filesystem.php | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 6568a07a59..eeca27d3a9 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -446,29 +446,7 @@ class OC_Filesystem{
}
}
}
-<<<<<<< HEAD
-=======
- static public function fromUploadedFile($tmpFile,$path){
- if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
- $run=true;
- $exists=self::file_exists($path);
- if(!$exists){
- OC_Hook::emit( self::CLASSNAME, self::signal_create, array( self::signal_param_path => $path, self::signal_param_run => &$run));
- }
- if($run){
- OC_Hook::emit( self::CLASSNAME, self::signal_write, array( self::signal_param_path => $path, self::signal_param_run => &$run));
- }
- if($run){
- $result=$storage->fromUploadedFile($tmpFile,self::getInternalPath($path));
- if(!$exists){
- OC_Hook::emit( self::CLASSNAME, self::signal_post_create, array( self::signal_param_path => $path));
- }
- OC_Hook::emit( self::CLASSNAME, self::signal_post_write, array( self::signal_param_path => $path));
- return $result;
- }
- }
- }
->>>>>>> master
+
static public function getMimeType($path){
return self::basicOperation('getMimeType',$path);
}
--
GitLab