Merge branch 'master' of github.com:gnuboard/g4s
Conflicts: lib/common.lib.php
This commit is contained in:
@ -997,9 +997,17 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
|
|||||||
|
|
||||||
if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
|
if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
|
||||||
$tmp_name = $tmp_name.' '.$name;
|
$tmp_name = $tmp_name.' '.$name;
|
||||||
|
<<<<<<< HEAD
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$tmp_name = $tmp_name.' '.$name;
|
$tmp_name = $tmp_name.' '.$name;
|
||||||
|
=======
|
||||||
|
} else {
|
||||||
|
$tmp_name = $tmp_name.' '.$name;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$tmp_name = $tmp_name.' '.$name;
|
||||||
|
>>>>>>> a51735e00ddf29bead8ea199ffa91d1234792320
|
||||||
}
|
}
|
||||||
$tmp_name .= '</a>';
|
$tmp_name .= '</a>';
|
||||||
|
|
||||||
@ -1008,7 +1016,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
|
|||||||
if(!$bo_table)
|
if(!$bo_table)
|
||||||
return $name;
|
return $name;
|
||||||
|
|
||||||
$tmp_name = "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&sca=".$sca."&sfl=wr_name,1&stx=".$name."\" title=\"$name 이름으로 검색\" class=\"sv_guest\" onclick=\"return false;\">$name</a>";
|
$tmp_name = '<a href="'.G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&sca='.$sca.'&sfl=wr_name,1&stx='.$name.'" title="'.$name.' 이름으로 검색" class="sv_guest" onclick="return false;">'.$name.'</a>';
|
||||||
$title_mb_id = '[비회원]';
|
$title_mb_id = '[비회원]';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user