diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
| commit | afb5de955e00490be5762247e817b20722091f37 (patch) | |
| tree | 035b826eacc5a21244c383075138731eaafeaebc /lib/public/files.php | |
| parent | 130c9cad030ca777e23ef70b76822553ea1c6411 (diff) | |
| parent | 31cc9aa80d4284e13dc95d2ef1428bed78c22d65 (diff) | |
| download | nextcloud-server-afb5de955e00490be5762247e817b20722091f37.tar.gz nextcloud-server-afb5de955e00490be5762247e817b20722091f37.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
Diffstat (limited to 'lib/public/files.php')
| -rw-r--r-- | lib/public/files.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/public/files.php b/lib/public/files.php index 90889c59ad8..75e1d2fbbc1 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -38,9 +38,10 @@ class Files { * @brief Recusive deletion of folders * @param string $dir path to the folder * + * @return bool */ static function rmdirr( $dir ) { - \OC_Helper::rmdirr( $dir ); + return \OC_Helper::rmdirr( $dir ); } /** |