Fixed bug in update_person_contact().

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

diff --git a/includes/session.inc b/includes/session.inc
index 9a93a5311fa57cdfc9194d446f61a38c6ef5ea7d..612957ae2f8777ca05aa413b090387f559686d77 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -140,6 +140,7 @@ function html_cleanup(&$parms)
                else
                        $parms[$name] = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
        }
+       reset($parms); // needed for direct key() usage later throughout the sources
 }
 
 //============================================================================
@@ -205,11 +206,17 @@ if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_
 
 $_SESSION['language']->set_language($_SESSION['language']->code);
 
-// include $Hooks object if locale file exists
+include_once($path_to_root . "/includes/hooks.inc");
+
+$Hooks = array();
+// include current langauge related $Hooks object if locale file exists
 if (file_exists($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc"))
 {
        include_once($path_to_root . "/lang/".$_SESSION['language']->code."/locale.inc");
-       $Hooks = new Hooks();
+       $code = $_SESSION['language']->code;
+       $hook_class = 'hooks_'.$code;
+       $Hooks[$code] = new $hook_class;
+       unset($code, $hook_class);
 }
 
 include_once($path_to_root . "/includes/access_levels.inc");