Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/dav/lib/Migration/DisableSystemAddressBook.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ public function run(IOutput $output) {
// We use count seen because getting a user count from the backend can be very slow
$limit = $this->appConfig->getAppValueInt('system_addressbook_limit', 5000);
if ($this->userManager->countSeenUsers() <= $limit) {
$output->info("Skipping repair step system address book has less then the threshold $limit of contacts no need to disable");
$output->info("Skipping repair step system address book has less than the threshold $limit of contacts no need to disable");
return;
}
$this->appConfig->setAppValueBool(ConfigLexicon::SYSTEM_ADDRESSBOOK_EXPOSED, false);
$output->warning("System address book disabled because it has more then the threshold of $limit contacts this can be re-enabled later");
$output->warning("System address book disabled because it has more than the threshold of $limit contacts this can be re-enabled later");
// Notify all admin users about the system address book being disabled
foreach ($this->groupManager->get('admin')->getUsers() as $user) {
$notification = $this->notificationManager->createNotification();
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/lib/Lib/Storage/FtpConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private function parseUnixItem(string $item, string $directory): array {
$tomorrow = (new \DateTime())->add(new \DateInterval('P1D'));

// since the provided date doesn't include the year, we either set it to the correct year
// or when the date would otherwise be in the future (by more then 1 day to account for timezone errors)
// or when the date would otherwise be in the future (by more than 1 day to account for timezone errors)
// we use last year
if ($parsedDate > $tomorrow) {
$parsedDate = $parsedDate->sub(new \DateInterval('P1Y'));
Expand Down
2 changes: 1 addition & 1 deletion apps/files_trashbin/src/files_views/columns.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ describe('files_trashbin: file list columns', () => {
})

expect(deletedBy.sort).toBeTypeOf('function')
// aaa is less then "Unknown"
// aaa is less than "Unknown"
expect(deletedBy.sort!(nodeA, nodeC)).toBeLessThan(0)
// zzz is greater than "Unknown"
expect(deletedBy.sort!(nodeB, nodeC)).toBeGreaterThan(0)
Expand Down
2 changes: 1 addition & 1 deletion dist/NcEmojiPicker-DGgqTnHp-BL4_K0PB.chunk.mjs.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/private/Lock/DBLockingProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public function changeLock(string $path, int $targetType): void {
$qb->expr()->eq('lock', $qb->createNamedParameter(-1, IQueryBuilder::PARAM_INT))
))->executeStatement();
} else {
// since we only keep one shared lock in the db we need to check if we have more then one shared lock locally manually
// since we only keep one shared lock in the db we need to check if we have more than one shared lock locally manually
if (isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 1) {
throw new LockedException($path);
}
Expand Down