From cc554f152984832bdfbda72c6e1fd2637f3c1ef9 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 3 Jul 2013 17:10:10 +0200 Subject: [PATCH 1/3] Fix #989 : Unable to reject thesaurus candidate --- www/thesaurus2/xmlhttp/reject.x.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/thesaurus2/xmlhttp/reject.x.php b/www/thesaurus2/xmlhttp/reject.x.php index dbd71c7afb..eed68243e7 100644 --- a/www/thesaurus2/xmlhttp/reject.x.php +++ b/www/thesaurus2/xmlhttp/reject.x.php @@ -49,7 +49,7 @@ if ($parm["bid"] !== null) { $databox = databox::get_instance((int) $parm['bid']); $connbas = connection::getPDOConnection($parm['bid']); - $dom = $databox->get_cterms(); + $dom = $databox->get_dom_cterms(); if ($dom) { $xpath = new DOMXPath($dom); From b43c5d9f6bdae3cb51ed2ee85e417ccc7107812b Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 4 Jul 2013 10:56:03 +0200 Subject: [PATCH 2/3] Fix neutron/imagine commit --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index 4e93b4637d..0e483363de 100644 --- a/composer.lock +++ b/composer.lock @@ -433,7 +433,7 @@ "source": { "type": "git", "url": "https://github.com/romainneutron/Imagine.git", - "reference": "1c48d4871eb7dbe9c834045d82e35eaf1044c8c4" + "reference": "f1ca9348f170138b9cc83033406bec90193f9708" }, "require": { "php": ">=5.3.2" From 23369fb04d7033ea968a0605aae7002f493212dd Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 4 Jul 2013 11:36:32 +0200 Subject: [PATCH 3/3] Prepare version 3.7.13 --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 185a67efe3..879706fff6 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.7.12'; + protected static $number = '3.7.13'; protected static $name = 'Carnosaurus'; public static function getNumber()