From 8e94646b3147d5f9f70ad09b4cc0aff284b93a98 Mon Sep 17 00:00:00 2001
From: Derek Jones
Date: Thu, 8 May 2008 19:55:35 +0000
Subject: removed extraneous error message from Upload lib on failure of
validate_upload_path()
http://codeigniter.com/bug_tracker/bug/4390/
---
system/libraries/Upload.php | 2 +-
user_guide/changelog.html | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 0fc38dc4f..317cf9560 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -144,7 +144,7 @@ class CI_Upload {
// Is the upload path valid?
if (! $this->validate_upload_path())
{
- $this->set_error('upload_no_filepath');
+ // errors will already be set by validate_upload_path() so just return FALSE
return FALSE;
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index eef799fb5..de289f7e6 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -126,6 +126,7 @@ SVN Commit: not currently released
Fixed an AR bug with or_where_not_in() (#4171).
Fixed a bug in the FTP library where delete_dir() was not working recursively (#4215).
Fixed a Validation bug when set_rules() is used with a non-array field name and rule (#4220).
+ Fixed a bug in the Upload library that might output the same error twice (#4390).
Fixed an AR bug when joining with a table alias and table prefix (#4400).
Fixed a bug in DB Forge, when inserting an id field (#3456).
Fixed a bug in the DB class testing the $params argument.
--
cgit v1.2.3-24-g4f1b