diff --git a/change_log.txt b/change_log.txt
index 5fa2f770..1758f612 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,7 +1,8 @@
 16/11/2010
 - bugfix whitespace in front of "<?php" in smarty_internal_compile_private_block_plugin.php
 - bugfix {$smarty.now} did compile incorrectly
-- bugfix on reset(),end(),next(),prev(),current() within tempaltes
+- bugfix on reset(),end(),next(),prev(),current() within templates
+- bugfix on default parameter for {function}
 
 15/11/2010
 - bugfix when using {$smarty.session} as object
diff --git a/libs/sysplugins/smarty_internal_compile_call.php b/libs/sysplugins/smarty_internal_compile_call.php
index 8d63b7c7..acfda688 100644
--- a/libs/sysplugins/smarty_internal_compile_call.php
+++ b/libs/sysplugins/smarty_internal_compile_call.php
@@ -54,7 +54,6 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
                 $_paramsArray[] = "'$_key'=>$_value";
             } 
         }
-	if (false) {
         if (isset($compiler->template->properties['function'][$_name]['parameter'])) {
             foreach ($compiler->template->properties['function'][$_name]['parameter'] as $_key => $_value) {
                 if (!isset($_attr[$_key])) {
@@ -76,9 +75,8 @@ class Smarty_Internal_Compile_Call extends Smarty_Internal_CompileBase {
                 } 
             } 
         }
-	}
         $_params = 'array(' . implode(",", $_paramsArray) . ')';
-    $_hash = str_replace('-','_',$compiler->template->properties['nocache_hash']);
+    	$_hash = str_replace('-','_',$compiler->template->properties['nocache_hash']);
         // was there an assign attribute
         if (isset($_assign)) {
             if ($compiler->template->caching) {
diff --git a/libs/sysplugins/smarty_internal_compile_function.php b/libs/sysplugins/smarty_internal_compile_function.php
index 3b7ebca2..6808ae5f 100644
--- a/libs/sysplugins/smarty_internal_compile_function.php
+++ b/libs/sysplugins/smarty_internal_compile_function.php
@@ -35,7 +35,7 @@ class Smarty_Internal_Compile_Function extends Smarty_Internal_CompileBase {
         if ($_attr['nocache'] === true) {
         	$this->compiler->trigger_template_error('nocache option not allowed', $this->compiler->lex->taglineno);
         }
-
+		unset($_attr['nocache']);
         $save = array($_attr, $compiler->parser->current_buffer,
             $compiler->template->has_nocache_code, $compiler->template->required_plugins);
         $this->_open_tag('function', $save);