Skip to content

[stable19] add repair job for unencoded group share uris #25449

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
rullzer merged 7 commits into from
Feb 17, 2021
Merged

[stable19] add repair job for unencoded group share uris #25449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fcf358e
add repair job for unencoded calendars
blizzz Jan 29, 2021
b570b22
take into account that UNIQUE index might not work as expected
blizzz Jan 29, 2021
ec12ac0
show suggestion to clean up possible invalid shares later
blizzz Jan 29, 2021
1dca63e
test: adjust expectation
blizzz Jan 29, 2021
8f499b9
add missing changes from backport source
blizzz Feb 17, 2021
1bb5314
compatibility to Nc 19
blizzz Feb 17, 2021
8315de9
adjust applicable version
blizzz Feb 17, 2021
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
Prev Previous commit
adjust applicable version 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Feb 17, 2021
commit 8315de942c61a548a795aefa95eea356058ca3ea
2 changes: 1 addition & 1 deletion lib/private/Repair/RepairDavShares.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ protected function repairUnencodedGroupShares() {
*/
public function run(IOutput $output) {
$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
if (version_compare($versionFromBeforeUpdate, '20.0.7', '<')
if (version_compare($versionFromBeforeUpdate, '19.0.9', '<')
&& $this->repairUnencodedGroupShares()
) {
$output->info('Repaired DAV group shares');
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Repair/RepairDavSharesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function testRun() {
$this->config->expects($this->any())
->method('getSystemValue')
->with('version', '0.0.0')
->willReturn('20.0.2');
->willReturn('19.0.2');

$this->output->expects($this->atLeastOnce())
->method('info');
Expand Down