Back - Fixed manage-settigns api returns empty string when no settings key in db

Colin Yang · Colin Yang · commit 8c854489293b · 2019-06-18T23:22:05.000+10:00
diff --git a/backend/class/api/Manage.class.php b/backend/class/api/Manage.class.php
@@ -29,7 +29,8 @@ private static function saltPassword($pwd) {
   }
 
   private static function settings() {
-    return json_decode(DbProvider::getDb()->getReserved(DbBase::$KEY_MANAGE_SETTINGS), true);
+    $settings = json_decode(DbProvider::getDb()->getReserved(DbBase::$KEY_MANAGE_SETTINGS), true);
+    return $settings === '' ? new stdClass : $settings;
   }
   private static function updateSetting($settingId, $value) {
     $settings = self::settings();

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ private static function saltPassword($pwd) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`private static function settings() {`
`32`		`- return json_decode(DbProvider::getDb()->getReserved(DbBase::$KEY_MANAGE_SETTINGS), true);`
	`32`	`+ $settings = json_decode(DbProvider::getDb()->getReserved(DbBase::$KEY_MANAGE_SETTINGS), true);`
	`33`	`+ return $settings === '' ? new stdClass : $settings;`
`33`	`34`	`}`
`34`	`35`	`private static function updateSetting($settingId, $value) {`
`35`	`36`	`$settings = self::settings();`