diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-18 12:20:09 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-18 12:20:09 +0200 |
| commit | eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2 (patch) | |
| tree | 4a53459150c6485666e350982ef3ad61ab3936c8 /lib/helper.php | |
| parent | 3e0e6e35f4fa638dd42bd5adc3b26e078bf3d081 (diff) | |
| parent | 57b8ff890c75169521041b4eb9cdf4582b68e551 (diff) | |
| download | nextcloud-server-eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2.tar.gz nextcloud-server-eb29c577c2b2378c1983e55ddaf4955ad9ae7fe2.zip | |
Merge branch 'master' into movable_apps
Diffstat (limited to 'lib/helper.php')
| -rwxr-xr-x | lib/helper.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/helper.php b/lib/helper.php index 52278f5c3a2..61a57ec27e3 100755 --- a/lib/helper.php +++ b/lib/helper.php @@ -502,6 +502,9 @@ class OC_Helper { */ public static function buildNotExistingFileName($path, $filename) { + if($path==='/'){ + $path=''; + } if ($pos = strrpos($filename, '.')) { $name = substr($filename, 0, $pos); $ext = substr($filename, $pos); @@ -518,7 +521,7 @@ class OC_Helper { $counter++; } - return $newname; + return $newpath; } /* |