Treat callables as callables no matter their origin

Should fix smarty-php#273
AnrDaemon · May 24, 2017 · d82b5b0 · d82b5b0
1 parent a49a087
commit d82b5b0
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/libs/sysplugins/smarty_internal_compile_private_modifier.php b/libs/sysplugins/smarty_internal_compile_private_modifier.php
@@ -48,20 +48,13 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                     case 1:
                         // registered modifier
                         if (isset($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ])) {
-                            $function =
-                                $compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ];
-                            if (!is_array($function)) {
-                                $output = "{$function}({$params})";
-                            } else {
-                                if (is_object($function[ 0 ])) {
-                                    $output = '$_smarty_tpl->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][\'' .
-                                              $modifier . '\'][0][0]->' . $function[ 1 ] . '(' . $params . ')';
-                                } else {
-                                    $output = $function[ 0 ] . '::' . $function[ 1 ] . '(' . $params . ')';
-                                }
+                            if (is_callable($compiler->smarty->registered_plugins[ Smarty::PLUGIN_MODIFIER ][ $modifier ][ 0 ])) {
+                                $output =
+                                    sprintf('call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], [ %s ])',
+                                            Smarty::PLUGIN_MODIFIER, var_export($modifier, true), $params);
+                                $compiler->known_modifier_type[ $modifier ] = $type;
+                                break 2;
                             }
-                            $compiler->known_modifier_type[ $modifier ] = $type;
-                            break 2;
                         }
                         break;
                     case 2: