Skip to content

[stable32] fix: Fix explode calls for path parsing #763

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

Draft
backportbot wants to merge 2 commits into
base: stable32
Choose a base branch
from
Draft

[stable32] fix: Fix explode calls for path parsing #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5d1b4e
fix: Fix explode calls for path parsing
come-nc May 28, 2026
3538b39
fix: Add error handling and rebuild updater.phar with correct box ver…
come-nc May 28, 2026
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
5 changes: 4 additions & 1 deletion index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,10 @@ public function createBackup(): void {
}

foreach ($this->getRecursiveDirectoryIterator($this->nextcloudDir, $excludedElements) as $absolutePath => $fileInfo) {
$relativePath = explode($this->nextcloudDir, $absolutePath)[1];
$relativePath = explode($this->nextcloudDir, $absolutePath, 2)[1] ?? null;
if ($relativePath === null) {
throw new \Exception($absolutePath . ' is not in ' . $this->nextcloudDir);
}
$relativeDirectory = dirname($relativePath);

// Create folder if it doesn't exist
Expand Down
5 changes: 4 additions & 1 deletion lib/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,10 @@ public function createBackup(): void {
}

foreach ($this->getRecursiveDirectoryIterator($this->nextcloudDir, $excludedElements) as $absolutePath => $fileInfo) {
$relativePath = explode($this->nextcloudDir, $absolutePath)[1];
$relativePath = explode($this->nextcloudDir, $absolutePath, 2)[1] ?? null;
if ($relativePath === null) {
throw new \Exception($absolutePath . ' is not in ' . $this->nextcloudDir);
}
$relativeDirectory = dirname($relativePath);

// Create folder if it doesn't exist
Expand Down
2 changes: 1 addition & 1 deletion tests/checkSameCodeBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function findDiffPos($original, $copy) {
* @var SplFileInfo $fileInfo
*/
foreach ($iterator as $path => $fileInfo) {
$fileName = explode($libDir, $path)[1];
$fileName = explode($libDir, $path, 2)[1];

if (array_search($fileName, $excludedFiles) !== false) {
continue;
Expand Down