summaryrefslogtreecommitdiffstats
path: root/application/controllers/user.php
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-10-19 23:01:51 +0200
committerFlorian Pritz <bluewind@xinu.at>2014-10-19 23:01:51 +0200
commit1abe7372404a9d65f3b59eda2d83e628267b366d (patch)
treee9820b18cb65240bb9549b5ed7ac78cc1d6cc59d /application/controllers/user.php
parentdbb2247b82ab49c50f424c904ac98702507f1a8e (diff)
Clean up the postgres changes
Style cleanup and some regression fixes Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers/user.php')
-rw-r--r--application/controllers/user.php13
1 files changed, 6 insertions, 7 deletions
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 57c6498b1..b542f2b4c 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -148,10 +148,9 @@ class User extends MY_Controller {
->get()->result_array();
// Convert timestamp to unix timestamp
- foreach ($query as & $record)
- {
- if ( ! empty($record['created']))
- {
+ // TODO: migrate database to integer timestamp and get rid of this
+ foreach ($query as &$record) {
+ if (!empty($record['created'])) {
$record['created'] = strtotime($record['created']);
}
}
@@ -389,11 +388,11 @@ class User extends MY_Controller {
if (empty($error)) {
$this->db->where('id', $userid)
- ->update('users', [
+ ->update('users', array(
'password' => $this->muser->hash_password($password)
- ]);
+ ));
- $this->db->where($key, $key)
+ $this->db->where('key', $key)
->delete('actions');
$this->load->view('header', $this->data);