Commit 28f5813f authored by Laurent's avatar Laurent

7.3.5

Merge branch 'origin-stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php
parents f165f76a 5b0d9906
01/09/2015 - v7.3.5
- ticket #28810 : diminution de l'empreinte mémoire de cosmogramme à l'indexation des ressources numériques
31/08/2015 - v7.3.4
- ticket #28796 : correction de la duplication d'entrées dans les facettes dynamiques si le libellé du champ à indexer est supérieur à 20 caractères
......
......@@ -257,6 +257,11 @@ if ($phase == 0.7)
$ret = $notice->traitePseudoNotice($enreg["type_doc_id"], $enreg);
tracePseudoNotice($ret, $enreg);
$phase_data["pointeur_reprise"] = $enreg["id"];
Class_Album::clearCache();
Class_AlbumRessource::clearCache();
Class_Notice::clearCache();
Class_Exemplaire::clearCache();
}
}
traceRecapPseudoNotices($phase_data);
......
......@@ -213,7 +213,7 @@ class KohaRecordIntegrationVagabondWithThesaurusOn702DollarATest extends KohaRec
['id' => 5,
'libelle' => 'd\'après l\'oeuvre d\'Eiji Yoshikawa, "Miyamoto Musashi"',
'id_thesaurus' => 'SUMM0001',
'id_origine' => 'D\'APRèS L\'OEUVRE D\'',
'id_origine' => 'D\'APRèS L\'OEUVRE D\'E',
'code' => 'summary'
]);
......
......@@ -243,8 +243,9 @@ class Class_CodifThesaurus extends Storm_Model_Abstract {
public function getOrCreateChild($id_origine, $label) {
if (!$entry = $this->getLoader()->findFirstBy(['code' => $this->getCode(),
'id_origine' => substr($id_origine, 0, self::COLUMN_ORIGIN_SIZE)])) {
if (!$entry = $this->getLoader()
->findFirstBy(['code' => $this->getCode(),
'id_origine' => mb_substr($id_origine, 0, self::COLUMN_ORIGIN_SIZE, 'UTF-8')])) {
$entry = $this
->newChildEntry()
->updateAttributes(['id_origine' => $id_origine,
......
......@@ -64,7 +64,7 @@ function defineConstant($name, $value) {
function setupConstants() {
defineConstant('BOKEH_MAJOR_VERSION','7.3');
defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.4');
defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.5');
defineConstant('ROOT_PATH', realpath(dirname(__FILE__).'/..').'/');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment