DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

v5 Develop Fixed: Setup error because setting table does not exist (#6390)

Browse source 
* Fixed missing oauth tables during setup.

* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop

* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop



Merge remote-tracking branch 'origin/develop' into develop

* Fixed error during setup when settings table is not present
This commit is contained in:
Wes Hulette 2018-11-02 15:23:41 -04:00 committed by snipe
parent 88b1da4260
commit 0d2eef5894
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Models/Setting.php
View file

@ -103,12 +103,17 @@ class Setting extends Model
* *
* @since 5.0.0 * @since 5.0.0
* *
* @return \App\Models\Setting * @return \App\Models\Setting|null
*/ */
public static function getSettings() public static function getSettings(): ?Setting
{ {
return Cache::rememberForever(self::APP_SETTINGS_KEY, function () { return Cache::rememberForever(self::APP_SETTINGS_KEY, function () {
// Need for setup as no tables exist
try {
return self::first(); return self::first();
} catch (\Throwable $th) {
return null;
}
}); });
} }