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

Merge branch 'g5'

Browse Source
This commit is contained in:
chicpro
2014-02-06 13:40:09 +09:00
parent e0f5d9e6a9 ad149439ba
commit 35ddacd44a
9 changed files with 171 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/common.lib.php
View File

@ -2195,7 +2195,7 @@ function html_end()
$buffer = ob_get_contents();
ob_end_clean();
preg_match('#<body>(.*)</body>#is', $buffer, $bodys);
preg_match_all('/(\r|\n)?<link[^>]+>/i', $bodys[0], $links);
preg_match_all('/[\n\r]?(<!.*)?(<link[^>]+>).*(<!.*>)?/i', $bodys[0], $links);
$stylesheet = '';
$links[0] = array_unique($links[0]);
foreach ($links[0] as $key=>$link) {
@ -2257,6 +2257,9 @@ function https_url($dir, $https=true)
// 게시판의 공지사항을 , 로 구분하여 업데이트 한다.
function board_notice($bo_notice, $wr_id, $insert=false)
{
if(strpos($bo_notice, strval($wr_id)) !== false)
return $bo_notice;
$notice_array = explode(",", trim($bo_notice));
$notice_array = array_merge(array($wr_id), $notice_array);
$notice_array = array_unique($notice_array);