kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

New translations and routes.

Browse Source
This commit is contained in:
James Cole
2018-06-29 12:11:44 +02:00
parent f048e943f8
commit 8c28c4b5ac
22 changed files with 234 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Support/Preferences.php
View File

@@ -125,14 +125,14 @@ class Preferences
*
* @return \FireflyIII\Models\Preference|null
*/
public function getForUser(User $user, $name, $default = null)
public function getForUser(User $user, $name, $default = null): ?Preference
{
$fullName = sprintf('preference%s%s', $user->id, $name);
if (Cache::has($fullName)) {
return Cache::get($fullName);
}
$preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
$preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $preference && null === $preference->data) {
try {
$preference->delete();
@@ -219,7 +219,7 @@ class Preferences
{
$fullName = sprintf('preference%s%s', $user->id, $name);
Cache::forget($fullName);
$pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
$pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $pref) {
$pref->data = $value;