Skip to content
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.

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

Remove files_texteditor from shipped apps #16528

Merged
merged 1 commit into from
Jul 24, 2019
Merged

Conversation

juliusknorr
Copy link
Member

I just checked if text app is there, not if the old one was removed, so with this the update process will work just fine since the app is not marked as shipped anymore:

server/lib/base.php

Lines 383 to 393 in 5898e87

foreach ($incompatibleApps as $appInfo) {
if ($appManager->isShipped($appInfo['id'])) {
$incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
}
}
if (!empty($incompatibleShippedApps)) {
$l = \OC::$server->getL10N('core');
$hint = $l->t('The files of the app %1$s were not replaced correctly. Make sure it is a version compatible with the server.', [implode(', ', $incompatibleShippedApps)]);
throw new \OC\HintException('The files of the app ' . implode(', ', $incompatibleShippedApps) . ' were not replaced correctly. Make sure it is a version compatible with the server.', $hint);
}

Fixes the update issue described in nextcloud/files_texteditor#169 (comment)

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@MorrisJobke MorrisJobke mentioned this pull request Jul 24, 2019
28 tasks
@MorrisJobke MorrisJobke merged commit 80b71dd into master Jul 24, 2019
@delete-merged-branch delete-merged-branch bot deleted the shipped-texteditor branch July 24, 2019 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug high
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants