summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-02-19 12:29:55 +0100
committerAndrey Andreev <narf@bofh.bg>2013-02-19 12:29:55 +0100
commit72b0988046e0d4b3a0bbf8f871285cf18f65d4c1 (patch)
tree9c27a8a7de1a3830ede9fa9b8e22b808ed5af1f4
parentfd5d918362d21fe7fe47a4e1b2607eec67a58a5c (diff)
parentf399425bacfa461a77be2e841c3c1f48f9241c4a (diff)
Merge pull request #2258 from vlakoff/develop
Fix a code comment in Upload->_file_mime_type()
-rw-r--r--system/libraries/Email.php6
-rw-r--r--system/libraries/Upload.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 1bf1da15e..074ce60fc 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -94,7 +94,7 @@ class CI_Email {
* @var int
*/
public $smtp_timeout = 5;
-
+
/**
* SMTP persistent connection
*
@@ -408,7 +408,7 @@ class CI_Email {
}
// --------------------------------------------------------------------
-
+
/**
* Destructor - Releases Resources
*
@@ -2018,7 +2018,7 @@ class CI_Email {
{
return TRUE;
}
-
+
if (strpos($reply, '334') !== 0)
{
$this->_set_error_message('lang:email_failed_smtp_login', $reply);
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index acd76b03b..1c14f99ed 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -1212,7 +1212,7 @@ class CI_Upload {
* Notes:
* - the DIRECTORY_SEPARATOR comparison ensures that we're not on a Windows system
* - many system admins would disable the exec(), shell_exec(), popen() and similar functions
- * due to security concerns, hence the function_exists() checks
+ * due to security concerns, hence the function_usable() checks
*/
if (DIRECTORY_SEPARATOR !== '\\')
{
@@ -1223,7 +1223,7 @@ class CI_Upload {
if (function_usable('exec'))
{
/* This might look confusing, as $mime is being populated with all of the output when set in the second parameter.
- * However, we only neeed the last line, which is the actual return value of exec(), and as such - it overwrites
+ * However, we only need the last line, which is the actual return value of exec(), and as such - it overwrites
* anything that could already be set for $mime previously. This effectively makes the second parameter a dummy
* value, which is only put to allow us to get the return status code.
*/