merge from 1.0

This commit is contained in:
qiang.xue
2009-06-29 20:00:12 +00:00
parent 1794a1995b
commit e9ef35facf
13 changed files with 176 additions and 53 deletions

View File

@@ -378,6 +378,7 @@ EOD;
foreach($table->columns as $column)
{
$label=ucwords(trim(strtolower(str_replace(array('-','_'),' ',preg_replace('/(?<![A-Z])[A-Z]/', ' \0', $column->name)))));
$label=preg_replace('/\s+/',' ',$label);
if(strcasecmp(substr($label,-3),' id')===0)
$label=substr($label,0,-3);
$labels[]="'{$column->name}'=>'$label'";