From 2c49d1f96f7e05898d537d56f51ae0ee5307eb19 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Wed, 7 Mar 2012 18:57:54 +0000 Subject: [PATCH] Restore the previous URLMaker in case the sending of a notification is not the last action of a page... (e.g. if the page displays the details of an object after sending the notifications...) SVN:trunk[1885] --- core/action.class.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/action.class.inc.php b/core/action.class.inc.php index 75f538b0d..87f21e844 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -303,7 +303,8 @@ class ActionEmail extends ActionNotification ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker); throw $e; } - + ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker); + if (!is_null($oLog)) { // Note: we have to secure this because those values are calculated