Skip to content

Commit a95c7ff

Browse files
committed
fix: User custom preferences for faily digest was always false
1 parent 47844cd commit a95c7ff

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

website/app-templates/smarty/emails/daily-digest.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
</table>
195195
{/if}
196196

197-
{if $loves}
197+
{if $loves|len}
198198
<div class="s-6"></div>
199199
<h5>{t}GeoKrety loves ❤️{/t}</h5>
200200
<div class="s-3"></div>

website/app/GeoKrety/Controller/Cli/DailyDigest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ protected function send() {
129129
}
130130

131131
$userSettings = UserSettings::instance();
132-
$daily_digest_enabled = $userSettings->get($this->user, 'DAILY_DIGEST');
132+
$daily_digest_enabled = $userSettings->get($this->user, 'DAILY_DIGEST', true);
133133

134134
if (!$daily_digest_enabled) {
135135
$this->console_writer->print([$this->user->id, $this->user->username, '403 don\'t want'], true);

website/app/GeoKrety/Service/UserSettings.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ public static function putForCurrentUser(string $setting_name, $value) {
6666
*
6767
* @return string|int|bool|null
6868
*/
69-
public function get(User|int|null $user, string $setting_name) {
69+
public function get(User|int|null $user, string $setting_name, bool $force_reload = false) {
7070
if (is_null($user)) {
7171
return $this->getDefault($setting_name);
7272
}
7373
$f3 = \Base::instance();
74-
if (!$f3->exists('SESSION.SETTINGS')) {
74+
if (!$f3->exists('SESSION.SETTINGS') || $force_reload) {
7575
$this->loadUserSettings($user);
7676
}
7777
if ($f3->exists('SESSION.SETTINGS.'.$setting_name)) {

0 commit comments

Comments
 (0)