summaryrefslogtreecommitdiff
path: root/includes/StreamFile.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2008-08-15 01:29:47 +0200
committerPierre Schmitz <pierre@archlinux.de>2008-08-15 01:29:47 +0200
commit370e83bb0dfd0c70de268c93bf07ad5ee0897192 (patch)
tree491674f4c242e4d6ba0d04eafa305174c35a3391 /includes/StreamFile.php
parentf4debf0f12d0524d2b2427c55ea3f16b680fad97 (diff)
Update auf 1.13.0
Diffstat (limited to 'includes/StreamFile.php')
-rw-r--r--includes/StreamFile.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index 2dbbe6de..b4bf531c 100644
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -12,7 +12,7 @@ function wfStreamFile( $fname, $headers = array() ) {
$encScript = htmlspecialchars( $_SERVER['SCRIPT_NAME'] );
echo "<html><body>
<h1>File not found</h1>
-<p>Although this PHP script ($encScript) exists, the file requested for output
+<p>Although this PHP script ($encScript) exists, the file requested for output
($encFile) does not.</p>
</body></html>
";
@@ -23,7 +23,7 @@ function wfStreamFile( $fname, $headers = array() ) {
// Cancel output buffering and gzipping if set
wfResetOutputBuffers();
-
+
$type = wfGetType( $fname );
if ( $type and $type!="unknown/unknown") {
header("Content-type: $type");
@@ -71,9 +71,7 @@ function wfGetType( $filename ) {
return 'unknown/unknown';
}
else {
- $magic=& MimeMagic::singleton();
+ $magic = MimeMagic::singleton();
return $magic->guessMimeType($filename); //full fancy mime detection
}
}
-
-