firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source 
Conflicts:
	lib/common.lib.php
This commit is contained in:
gnuboard
2013-05-22 14:18:07 +09:00
parent 371a14245d a51735e00d
commit c05830c646
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/common.lib.php
View File

@ -997,9 +997,17 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
$tmp_name = $tmp_name.' '.$name;
<<<<<<< HEAD
}
} else {
$tmp_name = $tmp_name.' '.$name;
=======
} else {
$tmp_name = $tmp_name.' '.$name;
}
} else {
$tmp_name = $tmp_name.' '.$name;
>>>>>>> a51735e00ddf29bead8ea199ffa91d1234792320
}
$tmp_name .= '</a>';
@ -1008,7 +1016,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
if(!$bo_table)
return $name;
$tmp_name = "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=wr_name,1&amp;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.'&amp;sca='.$sca.'&amp;sfl=wr_name,1&amp;stx='.$name.'" title="'.$name.' 이름으로 검색" class="sv_guest" onclick="return false;">'.$name.'</a>';
$title_mb_id = '[비회원]';
}