Merge pull request #344 from tyrant88/tyrant88-patch-95

Release 6.9.3
FriendsOfREDAXO · Aug 16, 2022 · 54caa41 · 54caa41
2 parents 03df96a + 7672fa9
commit 54caa41
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## Version 6.9.3 (2022-08-16)
+- Fix autoreindex on yform change for PHP 8.1 (#337) thx @gharlan
+
 ## Version 6.9.2 (2022-08-16)
 - Fix stats PlugIn for PHP 8.1
 

diff --git a/lib/search_it.php b/lib/search_it.php
@@ -1141,7 +1141,7 @@ private static function getMaxFID($_table)
     public function deleteIndex()
     {
         $delete = rex_sql::factory();
-		$delete->setQuery('TRUNCATE '. self::getTempTablePrefix() .'search_it_index');
+        $delete->setQuery('TRUNCATE ' . self::getTempTablePrefix() . 'search_it_index');
 
         $this->deleteCache();
     }
@@ -2000,9 +2000,13 @@ public function deleteCache($_indexIds = false)
         if ($_indexIds === false) {
             // delete entire search-cache
             $delete = rex_sql::factory();
-            $delete->setQuery('TRUNCATE '. self::getTempTablePrefix() . 'search_it_cacheindex_ids');
-            $delete->setQuery('TRUNCATE '. self::getTempTablePrefix() . 'search_it_cache');
-
+            if ($delete->inTransaction()) {
+                $delete->setQuery('DELETE FROM ' . self::getTempTablePrefix() . 'search_it_cacheindex_ids');
+                $delete->setQuery('DELETE FROM ' . self::getTempTablePrefix() . 'search_it_cache');
+            } else {
+                $delete->setQuery('TRUNCATE ' . self::getTempTablePrefix() . 'search_it_cacheindex_ids');
+                $delete->setQuery('TRUNCATE ' . self::getTempTablePrefix() . 'search_it_cache');
+            }
         } elseif (is_array($_indexIds) AND !empty($_indexIds)) {
             $sql = rex_sql::factory();
 

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: search_it
-version: '6.9.2'
+version: '6.9.3'
 author: Friends Of REDAXO
 supportpage: https://github.com/FriendsOfREDAXO/search_it
 

diff --git a/plugins/autocomplete/package.yml b/plugins/autocomplete/package.yml
@@ -1,5 +1,5 @@
 package: search_it/autocomplete
-version: '6.9.2'
+version: '6.9.3'
 author: Manétage
 
 title: 'translate:search_it_autocomplete_plugin_title'

diff --git a/plugins/documentation/package.yml b/plugins/documentation/package.yml
@@ -1,5 +1,5 @@
 package: search_it/documentation
-version: '6.9.2'
+version: '6.9.3'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_documentation_title'

diff --git a/plugins/plaintext/package.yml b/plugins/plaintext/package.yml
@@ -1,5 +1,5 @@
 package: search_it/plaintext
-version: '6.9.2'
+version: '6.9.3'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_plaintext_title'

diff --git a/plugins/stats/package.yml b/plugins/stats/package.yml
@@ -1,5 +1,5 @@
 package: search_it/stats
-version: '6.9.2'
+version: '6.9.3'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_stats_plugin_title'