wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OC_Image: Move Content-Type header to show function

Browse source
This commit is contained in:
Bart Visscher 2012-02-13 22:41:05 +01:00
parent 169ddc5b0b
commit 0fd5252cfc
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/image.php
View file

@ -102,6 +102,7 @@ class OC_Image {
* @returns bool
*/
public function show() {
header('Content-Type: '.$this->mimeType());
return $this->_output();
}
@ -117,17 +118,14 @@ class OC_Image {
} elseif($filepath === null && $this->filepath !== null) {
$filepath = $this->filepath;
}
return $this->_output($filepath, true);
return $this->_output($filepath);
}
/**
* @brief Outputs/saves the image.
*/
private function _output($filepath=null, $really=false) {
if($really === false) {
header('Content-Type: '.$this->mimeType());
$filepath = null; // Just being cautious ;-)
} else {
private function _output($filepath=null) {
if($filepath) {
if(!is_writable(dirname($filepath))) {
OC_Log::write('core',__METHOD__.'(): Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
return false;