diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-13 15:17:46 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-06-13 15:17:46 -0400 |
| commit | b5889d6ffe2a91ccb223a84a220cb1580bc42929 (patch) | |
| tree | aca675ac30746341e8ed835a9cb233cf76a7e2cc /apps/files/ajax | |
| parent | bd01e9346941fa85b4bb96a42cecdbc50e51c368 (diff) | |
| parent | f9bf34340c7618a90f8ac3452b7d89085882cab3 (diff) | |
| download | nextcloud-server-b5889d6ffe2a91ccb223a84a220cb1580bc42929.tar.gz nextcloud-server-b5889d6ffe2a91ccb223a84a220cb1580bc42929.zip | |
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
Diffstat (limited to 'apps/files/ajax')
| -rw-r--r-- | apps/files/ajax/list.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index ceb8d158580..f0600a179d0 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -38,7 +38,7 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){ } $list = new OCP\Template( "files", "part.list", "" ); -$list->assign( "files", $files ); +$list->assign( "files", $files, false ); $data = array('files' => $list->fetchPage()); OCP\JSON::success(array('data' => $data)); |