Gettext domain was not properly restored after invoking hook provided by extension.

[fa-stable.git] / includes / lang / gettext.php

diff --git a/includes/lang/gettext.php b/includes/lang/gettext.php
index 178ec3c8ab345783eac74eeacde901e7240699ee..a8ddcfc90ce9307121482dcb469600e91b7504dd 100644 (file)
--- a/includes/lang/gettext.php
+++ b/includes/lang/gettext.php
@@ -550,6 +550,17 @@ class gettext_php_support_compiler
 */
 function set_ext_domain($path='') {
        global $path_to_root;
+       static $domain_stack = array('');
+
+       if ($path)      // save path on domain stack
+               array_unshift($domain_stack,  $path);
+       else
+       {
+               array_shift($domain_stack);
+               $path = $domain_stack[0];
+       }
+       $lang_path = $path_to_root . ($path ? '/' : '') .$path.'/lang';
+
 
        $lang_path = $path_to_root . ($path ? '/' : '') .$path.'/lang';
        // ignore change when extension does not provide translation structure