From e0d06ee83ebf9ae72ef9746385155168fb083fa9 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 22 Oct 2015 11:27:03 +0200
Subject: [ticket/14044] Fix Sqlite error in tests

PHPBB3-14044
---
 phpBB/phpbb/search/fulltext_native.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/search/fulltext_native.php')

diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php
index 3a74955a18..5fc276170d 100644
--- a/phpBB/phpbb/search/fulltext_native.php
+++ b/phpBB/phpbb/search/fulltext_native.php
@@ -1478,10 +1478,7 @@ class fulltext_native extends \phpbb\search\base
 				$this->db->sql_return_on_error(false);
 			}
 			unset($new_words, $sql_ary);
-		}
-		else
-		{
-			$this->db->sql_transaction('begin');
+			$this->db->sql_transaction('commit');
 		}
 
 		// now update the search match table, remove links to removed words and add links to new words
@@ -1513,6 +1510,11 @@ class fulltext_native extends \phpbb\search\base
 			}
 		}
 
+		if (!count($unique_add_words))
+		{
+			$this->db->sql_transaction('begin');
+		}
+
 		$this->db->sql_return_on_error(true);
 		foreach ($words['add'] as $word_in => $word_ary)
 		{
-- 
cgit v1.2.1