Skip to content

[4.4] update to 5 from cli #41117

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
MacJoom merged 3 commits into from
Jul 23, 2023
Merged

[4.4] update to 5 from cli #41117

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
d016a84
Fix Indirect Modification of Overloaded Property
alikon Jul 6, 2023
46534b9
file_exists
alikon Jul 6, 2023
d8e85f3
Merge branch '4.4-dev' into patch-4
MacJoom Jul 23, 2023
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 libraries/src/Console/UpdateCoreCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ private function updateJoomlaCore($updatemodel): bool
// Remove the administrator/cache/autoload_psr4.php file
$autoloadFile = JPATH_CACHE . '/autoload_psr4.php';

if (File::exists($autoloadFile)) {
if (file_exists($autoloadFile)) {
File::delete($autoloadFile);
}

Expand Down
5 changes: 4 additions & 1 deletion libraries/src/Installer/InstallerHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,11 @@ public static function downloadPackage($url, $target = false)
$target = $tmpPath . '/' . basename($target);
}

// Fix Indirect Modification of Overloaded Property
$body = $response->body;

// Write buffer to file
File::write($target, $response->body);
File::write($target, $body);

// Restore error tracking to what it was before
ini_set('track_errors', $track_errors);
Expand Down