Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52

This commit is contained in:
Marvin Thomas Rabe 2011-10-06 22:36:34 +02:00
commit ae56bb63c6
1 changed files with 3 additions and 2 deletions

View File

@ -30,8 +30,9 @@ if ($source !== false) {
foreach (OC_Files::getdirectorycontent($source) as $i) { foreach (OC_Files::getdirectorycontent($source) as $i) {
$i['date'] = OC_Util::formatDate($i['mtime'] ); $i['date'] = OC_Util::formatDate($i['mtime'] );
if ($i['type'] == 'file') { if ($i['type'] == 'file') {
$i['extention'] = substr($i['name'], strrpos($i['name'], ".")); $fileinfo = pathinfo($i['name']);
$i['basename'] = substr($i['name'], 0, strrpos($i['name'], ".")); $i['basename'] = $fileinfo['filename'];
$i['extention'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
} }
$i['directory'] = substr($i['directory'], $rootLength); $i['directory'] = substr($i['directory'], $rootLength);
if ($i['directory'] == "/") { if ($i['directory'] == "/") {