fix #2842 php8の環境において、コンテンツ一覧画面でメールフォーム複製時にエラーが表示される

baserproject · Nov 6, 2023 · 1ce5cfc · 1ce5cfc
1 parent 228d33c
commit 1ce5cfc
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/Baser/Plugin/Mail/Model/MailContent.php b/lib/Baser/Plugin/Mail/Model/MailContent.php
@@ -292,7 +292,11 @@ public function copy($id, $newParentId, $newTitle, $newAuthorId, $newSiteId = nu
 			$data['Content']['site_id'] = $newSiteId;
 			$data['Content']['parent_id'] = $this->Content->copyContentFolderPath($url, $newSiteId);
 		}
-		$this->getDataSource()->begin();
+		$db = $this->getDataSource();
+		$transactionBegun = false;
+		if ($db->nestedTransactionSupported()) {
+			$transactionBegun = $db->begin();
+		}
 		if ($result = $this->save($data)) {
 			$result['MailContent']['id'] = $this->id;
 			$data = $result;
@@ -331,10 +335,14 @@ public function copy($id, $newParentId, $newTitle, $newAuthorId, $newSiteId = nu
 				'oldData' => $oldData,
 			]);
 
-			$this->getDataSource()->commit();
+			if ($transactionBegun) {
+				$db->commit();
+			}
 			return $result;
 		}
-		$this->getDataSource()->rollback();
+		if ($transactionBegun) {
+			$db->rollback();
+		}
 		return false;
 	}