Merge pull request #370 from tyrant88/tyrant88-patch-126

Fix incorrect new scanurl in redirect
FriendsOfREDAXO · Apr 6, 2023 · df062b2 · df062b2
2 parents 04cd71b + 095abaa
commit df062b2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## Version 6.9.8 (2023-04-06)
+- Fix incorrect new scanurl in redirect
 - Fix Warnings wenn Config noch nicht gespeichert
 
 ## Version 6.9.7 (2023-03-02)

diff --git a/lib/search_it.php b/lib/search_it.php
@@ -280,13 +280,13 @@ public function indexArticle($_id, $_clang = false, $clearCache = false)
                         $scanurl = str_replace(array('../', './'), '/',$response->getHeader('location'));
 
                         $scanparts = parse_url($scanurl);
-                        if (in_array('query',$scanparts)) {
+                        if (array_key_exists('query', $scanparts)) {
                             list($scanurl, $parameters) = explode('?', $scanurl);
                             parse_str($parameters, $output);
                             unset($output['search_it_build_index']);
                             $scanurl = $scanurl . '?' . http_build_query($output);
                         }
-                        if (!in_array('host',$scanparts)) {
+                        if (!array_key_exists('host', $scanparts)) {
                             $lastparts = parse_url($lastscanurl);
                             if ( isset($lastparts['scheme']) && isset($lastparts['host']) ) {
                                 $scanurl = $lastparts['scheme'] . '://' . $lastparts['host'] .
@@ -462,13 +462,13 @@ public function indexURL($url_hash, $article_id, $clang_id, $profile_id, $data_i
                     $scanurl = str_replace(array('../', './'), '/',$response->getHeader('location'));
 
                     $scanparts = parse_url($scanurl);
-                    if (in_array('query',$scanparts)) {
+                    if (array_key_exists('query', $scanparts)) {
                         list($scanurl, $parameters) = explode('?', $scanurl);
                         parse_str($parameters, $output);
                         unset($output['search_it_build_index']);
                         $scanurl = $scanurl . '?' . http_build_query($output);
                     }
-                    if (!in_array('host',$scanparts)) {
+                    if (!array_key_exists('host', $scanparts)) {
                         $lastparts = parse_url($lastscanurl);
                         if ( isset($lastparts['scheme']) && isset($lastparts['host']) ) {
                             $scanurl = $lastparts['scheme'] . '://' . $lastparts['host'] .

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: search_it
-version: '6.9.7'
+version: '6.9.8'
 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.7'
+version: '6.9.8'
 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.7'
+version: '6.9.8'
 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.7'
+version: '6.9.8'
 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.7'
+version: '6.9.8'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_stats_plugin_title'