Temporary fixes for php encoding library bugs ending with segfault.

[fa-stable.git] / admin / inst_module.php

diff --git a/admin/inst_module.php b/admin/inst_module.php
index 71d6f7424200b1634439de6b4fca394bc159a6db..2309292bef911ddfda922060b78dfa1900e74010 100644 (file)
--- a/admin/inst_module.php
+++ b/admin/inst_module.php
@@ -210,18 +210,16 @@ if (get_post('Refresh')) {
 
        $result = true;
        foreach($exts as $i => $ext) {
-               if ($ext['package'] && ($ext['active'] ^ check_value('Active'.$i))) {
+               if ($ext['package'] && ($ext['active'] ^ check_value('Active'.$i))) 
+               {
                        if (check_value('Active'.$i) && !check_src_ext_version($ext['version']))
                        {
                                display_warning(sprintf(_("Package '%s' is incompatible with current application version and cannot be activated.\n")
                                        . _("Check Install/Activate page for newer package version."), $ext['name']));
                                continue;
                        }
-                       if (!$ext['active'])
-                               $activated = activate_hooks($ext['package'], $comp);
-                       else
-                               $activated = hook_invoke($ext['package'], check_value('Active'.$i) ?
-                                'activate_extension':'deactivate_extension', $comp, false);
+                       $activated = activate_hooks($ext['package'], $comp, !$ext['active']);   // change active state
+
                        if ($activated !== null)
                                $result &= $activated;
                        if ($activated || ($activated === null))