Merge pull request #9004 from jdarwood007/backgroundTaskError

[3.0] Data handling errors

Author: jdarwood007

Sources/Tasks/BackgroundTask.php

@@ -16,6 +16,7 @@
 namespace SMF\Tasks;
 
 use SMF\Config;
+use SMF\Db\DatabaseApi as Db;
 use SMF\Sapi;
 use SMF\TaskRunner;
 use SMF\User;

Sources/Tasks/CreatePost_Notify.php

@@ -575,7 +575,7 @@ protected function handleWatchedNotifications(): void
 				// Use the target member's localization settings.
 				Parser::$time_offset = (int) $member_data['time_offset'];
 				Parser::$time_format = $member_data['time_format'];
-				Parser::$smiley_set = $member_data['smiley_set'];
+				Parser::$smiley_set = $member_data['smiley_set'] ?? '';
 				Parser::$locale = Lang::getLocaleFromLanguageName($member_data['lngfile']) ?? Lang::getTxt('lang_locale', file: 'General', lang: $member_data['lngfile']);
 
 				$parsed_message[$localization]['subject'] = $msgOptions['subject'];
@@ -612,9 +612,9 @@ protected function handleWatchedNotifications(): void
 				}
 
 				Parser::$time_offset = User::$me->time_offset;
-				Parser::$time_format = User::$me->$time_format;
+				Parser::$time_format = User::$me->time_format ?? '';
 				Parser::$smiley_set = (!empty(User::$me->smiley_set) ? User::$me->smiley_set : (!empty(Config::$modSettings['smiley_sets_default']) ? Config::$modSettings['smiley_sets_default'] : 'none'));
-				Parser::$locale = Lang::getLocaleFromLanguageName(User::$me->$language) ?? Lang::getTxt('lang_locale', file: 'General', lang: '');
+				Parser::$locale = Lang::getLocaleFromLanguageName(User::$me->language) ?? Lang::getTxt('lang_locale', file: 'General', lang: '');
 			}
 
 			// Bitwise check: Receiving an alert?