Merge pull request #1567 from owncloud/fixing-1505-stable45

know your libraries ;-)

1 files changed, 2 insertions, 6 deletions

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 7dde0f7bf2b..f21192f0130 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -431,7 +431,7 @@ class OC_FilesystemView {
 					$result = OC_Helper::streamCopy($source, $target);
 				}
 				if( $this->fakeRoot==OC_Filesystem::getRoot() ){
-					// If the file to be copied originates within

+					// If the file to be copied originates within
 					// the user's data directory
 					
 					OC_Hook::emit(
@@ -517,11 +517,7 @@ class OC_FilesystemView {
 		if(OC_Filesystem::isValidPath($path)) {
 			$source = $this->fopen($path, 'r');
 			if($source) {
-				$extension='';
-				$extOffset=strpos($path, '.');
-				if($extOffset !== false) {
-					$extension=substr($path, strrpos($path,'.'));
-				}
+				$extension = pathinfo($path, PATHINFO_EXTENSION);
 				$tmpFile = OC_Helper::tmpFile($extension);
 				file_put_contents($tmpFile, $source);
 				return $tmpFile;