Merge branch 'develop' into feature/pwhash

This commit is contained in:
bnu 2015-01-15 16:46:17 +09:00
commit a837f1e00a
156 changed files with 10370 additions and 658 deletions

View file

@ -540,7 +540,7 @@ class memberAdminView extends member
$extentionReplace = array('tel_0' => $extendForm->value[0],
'tel_1' => $extendForm->value[1],
'tel_2' => $extendForm->value[2]);
$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:30px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:30px" title="Third Number" />';
$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
}
else if($extendForm->column_type == 'textarea')
{