diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2012-11-29 13:50:49 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2012-11-29 13:50:49 -0800 |
| commit | 9b709fa95df5b93b9fb05e33158122003891c154 (patch) | |
| tree | 4ffa9874347b40cb23552387fc0dc43c8a5d9c0d /apps | |
| parent | c38a75e03f9db02b82e71472d2f719079eb44829 (diff) | |
| parent | bcb27c81d479c49613094fe6c147af5bdea3ea3c (diff) | |
| download | nextcloud-server-9b709fa95df5b93b9fb05e33158122003891c154.tar.gz nextcloud-server-9b709fa95df5b93b9fb05e33158122003891c154.zip | |
Merge pull request #635 from owncloud/ob_end
provide a safe way to end output buffering
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/appinfo/remote.php | 2 | ||||
| -rw-r--r-- | apps/files/download.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index 0ab7e7674c6..1713bcc22ce 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -27,7 +27,7 @@ $RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging'); OC_App::loadApps($RUNTIME_APPTYPES); -ob_end_clean(); +OC_Util::obEnd(); // Backends $authBackend = new OC_Connector_Sabre_Auth(); diff --git a/apps/files/download.php b/apps/files/download.php index 0d632c9b2c2..6475afb56e0 100644 --- a/apps/files/download.php +++ b/apps/files/download.php @@ -44,5 +44,5 @@ header('Content-Disposition: attachment; filename="'.basename($filename).'"'); OCP\Response::disableCaching(); header('Content-Length: '.OC_Filesystem::filesize($filename)); -@ob_end_clean(); +OC_Util::obEnd(); OC_Filesystem::readfile( $filename ); |