summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-04 14:55:27 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-04 14:55:27 +0100
commit76988e6827ed9e5eef43e8132df0f3705624c886 (patch)
tree7385c81e5d256457ceac0fde67df8fdee90434e6 /system/libraries
parent002b4be248e448227a718e6f7d9ee39ccc575745 (diff)
parent4383e36dd8af32ce3a8d8584bad78f62e8465726 (diff)
Merged conflicts.
Diffstat (limited to 'system/libraries')
-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 82383f658..545c92ff3 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1103,7 +1103,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)
{