fix Settings:__get

не было возможности хранить настройки под свойством которое совпадо с названием API
osben · Sep 12, 2016 · 4e4d090 · 4e4d090
1 parent 4172930
commit 4e4d090
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/api/Settings.php b/api/Settings.php
@@ -33,12 +33,10 @@ public function __construct()
 
     public function __get($name)
     {
-        if ($res = parent::__get($name)) {
-            return $res;
-        }
-
         if (isset($this->vars[$name])) {
             return $this->vars[$name];
+        } elseif ($res = parent::__get($name)) {
+            return $res;
         } else {
             return null;
         }