merge 충돌 수정

2015-10-02 17:54:24 +09:00
parent 7c65fd7ac7 44fc7a257b
commit ab084dbd55
8 changed files with 9 additions and 9 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -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);