Skip to content

Fix/misc #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TDannhauer merged 3 commits into from
May 25, 2026
Merged

Fix/misc #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59aea9b
Check for flags before modifying results array
TDannhauer May 25, 2026
2c8f902
Handle missing config values in prefs loading
TDannhauer May 25, 2026
a186067
Refactor SimpleFormatter initialization in LogHandlerFactory
TDannhauer May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/Horde/Core/ActiveSync/Driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions lib/Horde/Core/Prefs/Ui.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
5 changes: 2 additions & 3 deletions src/Factory/LogHandlerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
Loading