summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-10-29 14:39:55 +0100
committerFlorian Pritz <bluewind@xinu.at>2014-10-29 14:42:42 +0100
commit5b985a997f50e3476a606f40e2ced32b36cbef03 (patch)
tree363ceadb738e4f79ba96788c650d76ce37673177 /application/controllers
parent98534e4fa28b27727445f56414718de0a4d99968 (diff)
Make email sender configurable
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/user.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/application/controllers/user.php b/application/controllers/user.php
index b542f2b4c..be4359404 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -340,14 +340,7 @@ class User extends MY_Controller {
))
->insert('actions');
- $admininfo = $this->db->select('email')
- ->from('users')
- ->where('referrer', NULL)
- ->order_by('id', 'asc')
- ->limit(1)
- ->get()->row_array();
-
- $this->email->from($admininfo["email"]);
+ $this->email->from($this->config->item("email_from"));
$this->email->to($userinfo["email"]);
$this->email->subject("FileBin password reset");
$this->email->message(""