diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
| commit | 4753cc3ebde9867ab4deb1979fb4231b0c847426 (patch) | |
| tree | c6944e947bc84c8716b57b7e2b06ef51efccb3db /apps/files_external/lib/ftp.php | |
| parent | 6da5a2fdd4e8a19ab993b4a1f7de7e45b8922a16 (diff) | |
| parent | f3b30e4658c4dde82b56b458c672fa5edcba5d6b (diff) | |
| download | nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.tar.gz nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.zip | |
Merge branch 'master' into multi_app_dir
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
Diffstat (limited to 'apps/files_external/lib/ftp.php')
| -rw-r--r-- | apps/files_external/lib/ftp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index e9655ebf3a5..4d5ae670de5 100644 --- a/apps/files_external/lib/ftp.php +++ b/apps/files_external/lib/ftp.php @@ -21,7 +21,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{ $this->password=$params['password']; $this->secure=isset($params['secure'])?(bool)$params['secure']:false; $this->root=isset($params['root'])?$params['root']:'/'; - if(substr($this->root,0,1)!='/'){ + if(!$this->root || $this->root[0]!='/'){ $this->root='/'.$this->root; } |