diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-11-08 21:36:13 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-11-08 21:36:13 +0100 |
| commit | 41a61bc637c3d60efc5abe81c39fc726fd78cd1d (patch) | |
| tree | 07a1b4f9b895c3c8441a2c45356ad7e4565427ae /apps/files | |
| parent | 46071fed80c7375edf4788578776a6b313b6dca3 (diff) | |
| download | nextcloud-server-41a61bc637c3d60efc5abe81c39fc726fd78cd1d.tar.gz nextcloud-server-41a61bc637c3d60efc5abe81c39fc726fd78cd1d.zip | |
fix undefined index when loading files app
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/index.php | 4 | ||||
| -rw-r--r-- | apps/files/templates/part.list.php | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index cdb88ab83f2..4e5f4cd93a8 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -66,9 +66,7 @@ foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $i ) { $i['extension']=''; } } - if($i['directory']=='/') { - $i['directory']=''; - } + $i['directory'] = $dir; $files[] = $i; } diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 4b5ac325672..9c9d9926e55 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -18,7 +18,7 @@ $name = str_replace('%2F', '/', $name); $directory = str_replace('+', '%20', urlencode($file['directory'])); $directory = str_replace('%2F', '/', $directory); ?> - <tr data-id="<?php echo $file['id']; ?>" data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'> + <tr data-id="<?php echo $file['fileid']; ?>" data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'> <td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo OCP\mimetype_icon('dir'); else echo OCP\mimetype_icon($file['mimetype']); ?>)"> <?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?> <a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title=""> |