diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-19 11:30:12 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-19 11:30:12 +0200 |
| commit | a38463d41a2cd2653b5dc67dc886bbd464b0a8bd (patch) | |
| tree | 24838d2335688f772f6e61123ae3ec62a8d345ab /apps | |
| parent | 16560fe5c134f7afabdb673bd6727ff970dbdb41 (diff) | |
| parent | 0469f529fa3c5bb5c643f4c253f886f58ca50ba7 (diff) | |
| download | nextcloud-server-a38463d41a2cd2653b5dc67dc886bbd464b0a8bd.tar.gz nextcloud-server-a38463d41a2cd2653b5dc67dc886bbd464b0a8bd.zip | |
Merge branch 'master' into calendar_repeat
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_encryption/lib/cryptstream.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/get.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php index 56331cbf601..64fec381ded 100644 --- a/apps/files_encryption/lib/cryptstream.php +++ b/apps/files_encryption/lib/cryptstream.php @@ -159,7 +159,7 @@ class OC_CryptStream{ public function stream_close(){ $this->flush(); if($this->meta['mode']!='r' and $this->meta['mode']!='rb'){ - OC_FileCache::put($this->path,array('encrypted'=>true)); + OC_FileCache::put($this->path,array('encrypted'=>true),''); } return fclose($this->source); } diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index e2fcb82750d..a051451d33a 100644 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -61,7 +61,7 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) { $list->assign("downloadURL", OCP\Util::linkTo("", "public.php")."?service=files&token=".$token."&path="); $list->assign("readonly", true); $tmpl = new OCP\Template("files", "index", "user"); - $tmpl->assign("fileList", $list->fetchPage()); + $tmpl->assign("fileList", $list->fetchPage(), false); $tmpl->assign("breadcrumb", $breadcrumbNav->fetchPage()); $tmpl->assign("readonly", true); $tmpl->assign("allowZipDownload", false); |