Merge branch 'hotfix-0.3.1.20'

Author: Netrilix

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.3.1.20
+
+- Revert changes to User::fresh() but leave comment regarding upgrading Eloquent
+
 ## v0.3.1.19
 
 - Fix some minor error screen layout issues

userfrosting/initialize.php

@@ -155,7 +155,7 @@
         'guest_theme' => 'default',
         'minify_css' => '0',
         'minify_js' => '0',
-        'version' => '0.3.1.19',
+        'version' => '0.3.1.20',
         'author' => 'Alex Weissman',
         'show_terms_on_register' => '1',
         'site_location' => 'The State of Indiana'

userfrosting/models/database/User.php

@@ -87,9 +87,11 @@ public static function isLoggedIn(){
     /**
      * Refresh the User and their associated Groups from the DB.
      *
+     * If you are getting errors here after upgrading Eloquent, remove the word "array" from the function declaration.
+     *
      * @see http://stackoverflow.com/a/27748794/2970321
      */
-    public function fresh($options = []){
+    public function fresh(array $options = []){
         // TODO: Update table and column info, in case it has changed?
         $user = parent::fresh($options);
         $user->getGroupIds();