Bugfix Order

2015-11-11 02:49:59 +01:00
parent e5cfb4b5a9
commit 161eabdf00
7 changed files with 231 additions and 247 deletions
--- a/app/models/User.php
+++ b/app/models/User.php
@@ -61,7 +61,7 @@ class User extends Eloquent implements UserInterface, RemindableInterface {

    public function getSetting($key, $false = false) {
        $settings = json_decode($this->settings);
-        if(!is_null($settings))
+        if(!is_null($settings) && property_exists($settings, $key))
            return $settings->$key;
        else
            return $false;