merge 충돌 수정

This commit is contained in:
chicpro committed 2015-10-02 17:54:24 +09:00
commit ab084dbd55
8 files changed
+9 -9

No files matched your search

+1 -1
View File
@@ -1202,7 +1202,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$email = base64_encode($email);
$homepage = set_http(clean_xss_tags($homepage));
$name = get_text($name, true);
$name = get_text($name, 0, true);
$email = get_text($email);
$homepage = get_text($homepage);