Fixed lang domain switching in hooks_invoke_first/hook_invoke_last

diff --git a/includes/hooks.inc b/includes/hooks.inc
index 90bf2071b231bd2f2b059ccd717e38f939624f0e..515bcccf3c9f72a22f4bbf79439a3d1a4973c2b8 100644 (file)
--- a/includes/hooks.inc
+++ b/includes/hooks.inc
@@ -278,9 +278,9 @@ function hook_invoke_first($method, &$data, $opts=null)
                if (method_exists($hook, $method)) {
                        set_ext_domain('modules/'.$ext);
                        $result = $hook->$method($data, $opts);
+                       set_ext_domain();
                        if (isset($result))
                                break;
-                       set_ext_domain();
                }
        }
        return $result;
@@ -300,9 +300,9 @@ function hook_invoke_last($method, &$data, $opts=null)
                if (method_exists($hook, $method)) {
                        set_ext_domain('modules/'.$ext);
                        $result = $hook->$method($data, $opts);
+                       set_ext_domain();
                        if (isset($result))
                                break;
-                       set_ext_domain();
                }
        }
        return $result;