修复php5.3的bug。
Merge branch 'ruizhi' into develop

Conflicts:
	Function/helper.php