diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-07 11:47:14 +0200 |
| commit | 46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3 (patch) | |
| tree | 78896053233f385afbdc6006eade163626048bf6 /apps/files/ajax/list.php | |
| parent | 7d2a68fc314bcefa69413d85e69ffd10dc34ddc5 (diff) | |
| parent | 3a184e2e1d7ae49d596e06b724ffc36382d02596 (diff) | |
| download | nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.tar.gz nextcloud-server-46fe2e3e2a3d194d8ab17540ec991c5c8cc178e3.zip | |
fix merge conflicts
Diffstat (limited to 'apps/files/ajax/list.php')
| -rwxr-xr-x | apps/files/ajax/list.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 520e54e708d..ceb8d158580 100755 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -24,7 +24,7 @@ if($doBreadcrumb){ } } - $breadcrumbNav = new OC_Template( "files", "part.breadcrumb", "" ); + $breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" ); $breadcrumbNav->assign( "breadcrumb", $breadcrumb ); $data['breadcrumb'] = $breadcrumbNav->fetchPage(); @@ -37,7 +37,7 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){ $files[] = $i; } -$list = new OC_Template( "files", "part.list", "" ); +$list = new OCP\Template( "files", "part.list", "" ); $list->assign( "files", $files ); $data = array('files' => $list->fetchPage()); |