Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Conflicts:
	src/Fenom/Template.php
	tests/cases/Fenom/TemplateTest.php
This commit is contained in:
bzick
2013-07-22 18:33:55 +04:00
5 changed files with 84 additions and 12 deletions

View File

@ -615,7 +615,7 @@ class Compiler {
} elseif(isset($params[ $param->getPosition() ])) {
$args[] = $params[ $param->getPosition() ];
} elseif($param->isOptional()) {
$args[] = $param->getDefaultValue();
$args[] = var_export($param->getDefaultValue(), true);
}
}
return "$function(".implode(", ", $args).')';