Merge pull request #129 from nextcloud/fix/121/ignore-default-apps-fo…

…lder ignoring default apps folder when working on custom_apps
nextcloud · Dec 29, 2021 · 069fe25 · 069fe25
2 parents cb6a69a + 571f71d
commit 069fe25
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/Service/PointService.php b/lib/Service/PointService.php
@@ -475,7 +475,12 @@ private function addCustomApps(RestoringPoint $point): void {
 				continue;
 			}
 
-			$name = 'apps-' . str_replace('/', '', $this->get('url', $app) . '-' . $this->uuid(8));
+			$customUrl = str_replace('/', '', $this->get('url', $app));
+			if ($this->get('path', $app) === OC::$SERVERROOT . '/apps' && $customUrl === 'apps') {
+				continue;
+			}
+
+			$name = 'apps-' . $customUrl . '-' . $this->uuid(8);
 			$path = ltrim($this->get('path', $app), '/');
 			$point->addRestoringData(new RestoringData(RestoringData::ROOT_DISK, $path, $name));
 		}