From 0769a9cb971e309b3492589c97a3e75d9db7e8e5 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Tue, 6 Mar 2012 19:08:16 +0100 Subject: [PATCH 1/3] fix sprintf issue --- lib/classes/eventsmanager/notify/downloadmailfail.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/classes/eventsmanager/notify/downloadmailfail.class.php b/lib/classes/eventsmanager/notify/downloadmailfail.class.php index 8242189a83..c76b8009b9 100644 --- a/lib/classes/eventsmanager/notify/downloadmailfail.class.php +++ b/lib/classes/eventsmanager/notify/downloadmailfail.class.php @@ -169,10 +169,8 @@ class eventsmanager_notify_downloadmailfail extends eventsmanager_notifyAbstract $date = new\DateTime('now'); -// $text = sprintf(_("L'export effectué le %s à destination de %s concernant les elements suivants %s à echoue pour les raisons suivantes : %s") -// ,$date->format("Y-m-d H:i:s"), $dest, implode(', ', $records), $reason); $text = sprintf(_("L'export effectué le %s à destination de %s à echoue pour les raisons suivantes : %s") - ,$date->format("Y-m-d H:i:s") , $reason); + ,$date->format("Y-m-d H:i:s") , $dest, $reason); } else From 80c22ae265e5599ac5ef89ba3cd0731b61cc95f4 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Tue, 6 Mar 2012 19:18:53 +0100 Subject: [PATCH 2/3] blacklist vendor & unitTest from codecoverage --- lib/phpunit.xml.dist | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/phpunit.xml.dist b/lib/phpunit.xml.dist index 0daccfcdda..262c5f2fb4 100644 --- a/lib/phpunit.xml.dist +++ b/lib/phpunit.xml.dist @@ -31,6 +31,13 @@ ../lib/unitTest/ + + + + ./vendor + ./unitTest + + From cd61d7fcbd21b760bac2c4b667c2da219de7363d Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Tue, 6 Mar 2012 20:28:39 +0100 Subject: [PATCH 3/3] fix #511 fail load css theme from user preference --- lib/Alchemy/Phrasea/Controller/Prod/Root.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index c227378d88..fe3e3bb7db 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -55,7 +55,7 @@ class Root implements ControllerProviderInterface { if (substr($file, 0, 1) == "." || mb_strtolower($file) == "cvs") continue; - if (is_dir($cssPath . $file)) + if (is_dir($cssPath . $file) && ctype_xdigit($file)) { $css[$file] = $file; }