g5 merge 충돌수정

This commit is contained in:
chicpro
2014-04-10 17:25:42 +09:00
11 changed files with 15 additions and 28 deletions

View File

@ -239,7 +239,7 @@ function captcha_html($class="captcha")
//$html .= "\n".'<script>var g5_captcha_path = "'.G5_CAPTCHA_PATH.'";</script>';
$html .= "\n".'<script src="'.G5_CAPTCHA_URL.'/kcaptcha.js"></script>';
$html .= "\n".'<fieldset id="captcha" class="'.$class.'">';
$html .= "\n".'<legend>자동등록방지</legend>';
$html .= "\n".'<legend><label for="captcha_key">자동등록방지</label></legend>';
if (G5_IS_MOBILE) $html .= '<audio src="#" id="captcha_audio" controls></audio>';
//$html .= "\n".'<img src="#" alt="" id="captcha_img">';
$html .= "\n".'<img src="javascript:void(0);" alt="" id="captcha_img">';