Merge branch 'date-joined-bug'

cdevroe · Jan 15, 2014 · 2106974 · 2106974
2 parents ef55839 + 73df0ee
commit 2106974
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/application/models/users_model.php b/application/models/users_model.php
@@ -32,10 +32,11 @@ function create_user()
         }
 
 		$this->db->insert('users', array(
-            'email'    => $email,
-            'password' => $hash['encrypted'],
-            'salt'     => $hash['salt'],
-            'status'   => 'active'
+            'email'       => $email,
+            'password'    => $hash['encrypted'],
+            'salt'        => $hash['salt'],
+            'status'      => 'active',
+            'date_joined' => date('Y-m-d H:i:s')
         ));
 
 		// Get userid of this user

diff --git a/application/views/changelog.php b/application/views/changelog.php
@@ -5,6 +5,11 @@
     <h2>Changelog</h2>
 		<p>A quick list of what's new. Posted immediately upon update.</p>
 
+        <h4 id="0311"><a href="#0311">0.3.11 - 15 January 2014</a></h4>
+          <ul>
+            <li>Bug: Added date_joined back to being saved on new user accounts.</li>
+          </ul>
+
         <h4 id="0310"><a href="#0310">0.3.10 - 15 January 2014</a></h4>
           <ul>
             <li>Update: Users with old password encryption technique will be update to new encrypted password/salt upon next successful login.</li>