summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authortubalmartin <tubalmartin@gmail.com>2012-03-03 22:24:31 +0100
committertubalmartin <tubalmartin@gmail.com>2012-03-03 22:24:31 +0100
commit010f1f4b315c8f5aef2e0b4c6571e4c4752f56c6 (patch)
treed1ddd6f0327f8063dd2c825b285ae8004f6689e9 /system
parent1887c6d4847fd9d4251b58aba599cb8ee63d2e38 (diff)
Fixed a bug - CI_Upload::_file_mime_type() could've failed if popen() is used for the detection.
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 91fbf66ca..b0490de30 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1095,7 +1095,7 @@ class CI_Upload {
$proc = @popen($cmd, 'r');
if (is_resource($proc))
{
- $mime = @fread($test, 512);
+ $mime = @fread($proc, 512);
@pclose($proc);
if ($mime !== FALSE)
{