diff --git a/lib/Horde/Core/ActiveSync/Driver.php b/lib/Horde/Core/ActiveSync/Driver.php index ec477b68..86b1ccaf 100644 --- a/lib/Horde/Core/ActiveSync/Driver.php +++ b/lib/Horde/Core/ActiveSync/Driver.php @@ -1422,11 +1422,15 @@ public function getServerChanges( $flags = $folder->flags(); $categories = $folder->categories(); foreach ($changes['modify'] as $uid) { + if (!isset($flags[$uid])) { + continue; + } + $results[] = [ 'id' => $uid, 'type' => Horde_ActiveSync::CHANGE_TYPE_FLAGS, 'flags' => $flags[$uid], - 'categories' => $categories[$uid], + 'categories' => $categories[$uid] ?? [], ]; } } else { diff --git a/lib/Horde/Core/Prefs/Ui.php b/lib/Horde/Core/Prefs/Ui.php index b851ff6c..7b5268cd 100644 --- a/lib/Horde/Core/Prefs/Ui.php +++ b/lib/Horde/Core/Prefs/Ui.php @@ -768,9 +768,10 @@ protected function _loadPrefs($app, $data = false) try { $pconf = $registry->loadConfigFile('prefs.php', ['prefGroups', '_prefs'], $app); + $config = $pconf->config ?? []; $res = [ - 'prefGroups' => $pconf->config['prefGroups'], - '_prefs' => $pconf->config['_prefs'], + 'prefGroups' => $config['prefGroups'] ?? [], + '_prefs' => $config['_prefs'] ?? [], ]; } catch (Horde_Exception $e) { $res = [ diff --git a/src/Factory/LogHandlerFactory.php b/src/Factory/LogHandlerFactory.php index 0a142df3..55f2f983 100644 --- a/src/Factory/LogHandlerFactory.php +++ b/src/Factory/LogHandlerFactory.php @@ -76,9 +76,8 @@ public function create(Injector $injector): LogHandler case 'default': default: - // Match legacy Horde_Log_Handler_Stream + SimpleFormatter: - // append a line break after the (pre-formatted) message. - $formatters[] = new SimpleFormatter('%message%' . PHP_EOL); + // Match legacy Horde_Log_Handler_Stream + SimpleFormatter. + $formatters[] = new SimpleFormatter(); break; case 'xml':