Merge pull request #2229 from nextcloud/fix/sort-order-on-edit

fix(softUndeleteEntry): Only reset index of bookmarks if it is indeed…
nextcloud · Oct 9, 2024 · 8899753 · 8899753
2 parents ee49534 + 1ed4a56
commit 8899753
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/lib/Db/TreeMapper.php b/lib/Db/TreeMapper.php
@@ -542,20 +542,21 @@ public function softUndeleteEntry(string $type, int $id, ?int $folderId = null):
 			return;
 		}
 
-		// set entry as not deleted
-		// has to come last to not break findByAncestorFolder
-		$qb = $this->db->getQueryBuilder();
-		$qb
-			->update('bookmarks_tree')
-			->set('soft_deleted_at', $qb->createNamedParameter(null, IQueryBuilder::PARAM_DATE))
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
-			->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_STR)));
-		if ($folderId !== null) {
-			$qb->set('index', $qb->createNamedParameter($this->countChildren($folderId)));
-			$qb->andWhere($qb->expr()->eq('parent_folder', $qb->createNamedParameter($folderId, IQueryBuilder::PARAM_INT)));
+		if ($this->isEntrySoftDeleted($type, $id, $folderId)) {
+			// set entry as not deleted
+			// has to come last to not break findByAncestorFolder
+			$qb = $this->db->getQueryBuilder();
+			$qb
+				->update('bookmarks_tree')
+				->set('soft_deleted_at', $qb->createNamedParameter(null, IQueryBuilder::PARAM_DATE))
+				->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
+				->andWhere($qb->expr()->eq('type', $qb->createNamedParameter($type, IQueryBuilder::PARAM_STR)));
+			if ($folderId !== null) {
+				$qb->set('index', $qb->createNamedParameter($this->countChildren($folderId)));
+				$qb->andWhere($qb->expr()->eq('parent_folder', $qb->createNamedParameter($folderId, IQueryBuilder::PARAM_INT)));
+			}
+			$qb->executeStatement();
 		}
-		$qb->executeStatement();
-
 	}
 
 	/**