Merged stable branch up to 2.3.10

[fa-stable.git] / includes / hooks.inc

diff --git a/includes/hooks.inc b/includes/hooks.inc
index 080798c22adb6d6748fda75d682eecce6bf1e07e..cd40491b31fa17998cf7efec7653392eec0b1254 100644 (file)
--- a/includes/hooks.inc
+++ b/includes/hooks.inc
@@ -262,8 +262,8 @@ function hook_invoke_all($method, &$data, $opts=null)
                        } else if (isset($result)) {
                                $return[] = $result;
                                }
+                       set_ext_domain();
                }
-       set_ext_domain();
        return $return;
 }
 /*
@@ -281,9 +281,9 @@ function hook_invoke_first($method, &$data, $opts=null)
                        $result = $hook->$method($data, $opts);
                        if (isset($result))
                                break;
+                       set_ext_domain();
                }
        }
-       set_ext_domain();
        return $result;
 }
 /*
@@ -303,9 +303,9 @@ function hook_invoke_last($method, &$data, $opts=null)
                        $result = $hook->$method($data, $opts);
                        if (isset($result))
                                break;
+                       set_ext_domain();
                }
        }
-       set_ext_domain();
        return $result;
 }
 //------------------------------------------------------------------------------------------