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

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-08-06 11:03:38 +09:00
parent cc9c16f191 e86e633a11
commit 46b21c3373
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/boardgroupmember_form.php
View File

@ -34,7 +34,6 @@ $colspan = 4;
<th scope="col">그룹아이디</th> <th scope="col">그룹아이디</th>
<th scope="col">그룹</th> <th scope="col">그룹</th>
<th scope="col">처리일시</th> <th scope="col">처리일시</th>
<th scope="col">삭제</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -54,7 +53,6 @@ $colspan = 4;
<td class="td_grid"><a href="<?php echo $g4['bbs_path'] ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td> <td class="td_grid"><a href="<?php echo $g4['bbs_path'] ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_id'] ?></a></td>
<td class="td_category"><?php echo $row['gr_subject'] ?></td> <td class="td_category"><?php echo $row['gr_subject'] ?></td>
<td class="td_time"><?php echo $row['gm_datetime'] ?></td> <td class="td_time"><?php echo $row['gm_datetime'] ?></td>
<td class="td_mng"><?php echo $s_del ?></td>
</tr> </tr>
<?php <?php
} }

1
lib/common.lib.php
View File

@ -570,6 +570,7 @@ function html_purifier($html)
$config->set('HTML.SafeObject', true); $config->set('HTML.SafeObject', true);
$config->set('HTML.SafeIframe', true); $config->set('HTML.SafeIframe', true);
$config->set('URI.SafeIframeRegexp','%^(https?:)?//('.$safeiframe.')%'); $config->set('URI.SafeIframeRegexp','%^(https?:)?//('.$safeiframe.')%');
$config->set('Attr.AllowedFrameTargets', array('_blank'));
$purifier = new HTMLPurifier($config); $purifier = new HTMLPurifier($config);
return $purifier->purify($html); return $purifier->purify($html);
} }