Extensions: fixed gettext support for modules.

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

diff --git a/includes/hooks.inc b/includes/hooks.inc
index 609eac31203b49b4a2efdac51f2aaf54d1161232..6a158a762e266a7536f07ce26bcd9069a3639818 100644 (file)
--- a/includes/hooks.inc
+++ b/includes/hooks.inc
@@ -242,6 +242,7 @@ function install_hooks($lang_code=null)
                        $hook_class = 'hooks_'.$ext['package'];
                        if ($ext['active'] && class_exists($hook_class)) {
                                $Hooks[$ext['package']] = new $hook_class;
+                               $Hooks[$ext['package']]->path = $ext['path'];
                        }
                }       
        }
@@ -279,7 +280,7 @@ function hook_invoke($ext, $method, &$data, $opts=null)
 
        $ret = null;
        if (isset($Hooks[$ext]) && method_exists($Hooks[$ext], $method)) {
-               set_ext_domain('modules/'.$ext);
+               set_ext_domain($Hooks[$ext]->path);
                $ret = $Hooks[$ext]->$method($data, $opts);
                set_ext_domain();
        } 
@@ -299,7 +300,7 @@ function hook_invoke_all($method, &$data, $opts=null)
        {
                foreach($Hooks as $ext => $hook)
                        if (method_exists($hook, $method)) {
-                               set_ext_domain('modules/'.$ext);
+                               set_ext_domain($hook->path);
                                $result = $hook->$method($data, $opts);
                                if (isset($result) && is_array($result)) {
                                        $return = array_merge_recursive($return, $result);
@@ -322,7 +323,7 @@ function hook_invoke_first($method, &$data, $opts=null)
        $result = null;
        foreach($Hooks as $ext => $hook) {
                if (method_exists($hook, $method)) {
-                       set_ext_domain('modules/'.$ext);
+                       set_ext_domain($hook->path);
                        $result = $hook->$method($data, $opts);
                        set_ext_domain();
                        if (isset($result))
@@ -344,7 +345,7 @@ function hook_invoke_last($method, &$data, $opts=null)
        $Reverse = array_reverse($Hooks);
        foreach($Reverse as $ext => $hook) {
                if (method_exists($hook, $method)) {
-                       set_ext_domain('modules/'.$ext);
+                       set_ext_domain($hook->path);
                        $result = $hook->$method($data, $opts);
                        set_ext_domain();
                        if (isset($result))