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.

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

Before installing new shipped apps we need to load authentication apps #22584

Merged
merged 3 commits into from
Feb 25, 2016
Merged

Before installing new shipped apps we need to load authentication apps #22584

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
7bf658a
Before installing new shipped apps we need to load authentication app…
DeepDiver1975 Feb 22, 2016
ad6238c
Install new shipped apps after upgrading all existing apps
DeepDiver1975 Feb 23, 2016
bfde96a
Fix PHPDoc of OC_App::loadApps()
DeepDiver1975 Feb 23, 2016
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
2 changes: 1 addition & 1 deletion lib/private/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static function isAppLoaded($app) {
/**
* loads all apps
*
* @param array $types
* @param string[] | string | null $types
* @return bool
*
* This function walks through the ownCloud directory and loads all apps
Expand Down
6 changes: 3 additions & 3 deletions lib/private/updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,16 +324,16 @@ private function doUpgrade($currentVersion, $installedVersion) {
if ($this->updateStepEnabled) {
$this->doCoreUpgrade();

// install new shipped apps on upgrade
OC_Installer::installShippedApps();

// update all shipped apps
$disabledApps = $this->checkAppsRequirements();
$this->doAppUpgrade();

// upgrade appstore apps
$this->upgradeAppStoreApps($disabledApps);

// install new shipped apps on upgrade
OC_App::loadApps('authentication');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://scrutinizer-ci.com/g/owncloud/core/inspections/66ee62e3-218f-4eb6-8fdb-a8ddc5d01060/issues/files/lib/private/updater.php?status=new&orderField=path&order=asc&honorSelectedPaths=0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also all other usages indicate OC_App::loadApps(array('authentication'))

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(alternatively we should adjust the PHPDoc if that is supposed to work as well)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will loadApps automatically update these authentication apps too if needed ? (I don't remember)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

load will not, but that is why we do the upgrades before, see above

OC_Installer::installShippedApps();

// post-upgrade repairs
$repair = new Repair(Repair::getRepairSteps());
Expand Down