diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php index 321b19f951..e2af26a5ac 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/Indexer/RecordIndex.php @@ -118,7 +118,7 @@ class RecordIndex implements MappingProvider $child->setAnalyzer('keyword', 'searching'); $child->addChild((new Mapping\StringFieldMapping('raw'))->enableRawIndexing()); - $thesaurusMapping->addChild($thesaurusMapping); + $thesaurusMapping->addChild($child); } return $thesaurusMapping; diff --git a/lib/classes/ACL.php b/lib/classes/ACL.php index f220183589..5c51cbee2f 100644 --- a/lib/classes/ACL.php +++ b/lib/classes/ACL.php @@ -1152,8 +1152,9 @@ class ACL implements cache_cacheableInterface return $this; } - private function try_give_access_to_base_insert(&$stmt, $base_id, $usr_id) + private function try_give_access_to_base_insert(PDOStatement $stmt, $base_id, $usr_id) { + $stmt = null; $inserted = false; try { $stmt->execute([':base_id' => $base_id, ':usr_id' => $usr_id]); @@ -1169,7 +1170,7 @@ class ACL implements cache_cacheableInterface return $inserted; } - private function try_give_access_to_base_update(&$stmt, $base_id, $usr_id) + private function try_give_access_to_base_update(PDOStatement $stmt, $base_id, $usr_id) { $stmt->execute([':base_id' => $base_id, ':usr_id' => $usr_id]); $stmt->closeCursor(); diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml index 3a312ed3bb..27eb933247 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml @@ -5,6 +5,7 @@ languages: main: maintenance: false key: '' + api_require_ssl: true database: host: 'sql-host' port: 3306 diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml index 3a312ed3bb..27eb933247 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml +++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml @@ -5,6 +5,7 @@ languages: main: maintenance: false key: '' + api_require_ssl: true database: host: 'sql-host' port: 3306 diff --git a/tests/files/cestlafete.jpg b/tests/files/cestlafete.jpg index 7829881e39..698ec817b0 100755 Binary files a/tests/files/cestlafete.jpg and b/tests/files/cestlafete.jpg differ