summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2012-06-22 16:17:23 +0000
committerTom Needham <needham.thomas@gmail.com>2012-06-22 16:17:23 +0000
commit41cfd55f5501dc90a96d0e1812fbb197e35955ac (patch)
tree99d209f49ca3e0a935ac27a6cac3f03cf552beb9 /apps
parent0aafc717ec676cbedb21443fc05cd5b0496b8b42 (diff)
parentebfc5b2762053960048b4f6a63ddc33482059edd (diff)
downloadnextcloud-server-41cfd55f5501dc90a96d0e1812fbb197e35955ac.tar.gz
nextcloud-server-41cfd55f5501dc90a96d0e1812fbb197e35955ac.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'apps')
-rw-r--r--apps/contacts/thumbnail.php1
-rw-r--r--apps/gallery/ajax/thumbnail.php1
-rw-r--r--apps/gallery/templates/index.php1
3 files changed, 3 insertions, 0 deletions
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index da4e930f3e5..8378507163e 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -23,6 +23,7 @@
OCP\JSON::checkLoggedIn();
//OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('contacts');
+session_close_write();
function getStandardImage(){
//OCP\Response::setExpiresHeader('P10D');
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
index 4fc9eba992d..5bf1d420dc4 100644
--- a/apps/gallery/ajax/thumbnail.php
+++ b/apps/gallery/ajax/thumbnail.php
@@ -23,6 +23,7 @@
OCP\JSON::checkLoggedIn();
OCP\JSON::checkAppEnabled('gallery');
+session_write_close();
require_once('apps/gallery/lib/managers.php');
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 037e53059d1..c3b4a178545 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -26,6 +26,7 @@ $(document).ready(function() {
</div>
<div id="gallerycontent">
<?php
+session_write_close();
echo $_['tl']->get();