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-06-13 18:10:38 +09:00
parent 08beb5a213 0a0ff36b41
commit c02409fdd2
3 changed files with 411 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common.lib.php
View File

@ -1964,7 +1964,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('/(\r|\n)?<link[^>]+>/i', $bodys[0], $links);
$stylesheet = '';
$links[0] = array_unique($links[0]);
foreach ($links[0] as $key=>$link) {

6
lib/thumbnail.lib.php
View File

@ -34,6 +34,9 @@ function get_list_thumbnail($bo_table, $wr_id, $thumb_width, $thumb_height, $is_
else
$data_path = $p['path'];
if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path))
continue;
$srcfile = G4_PATH.$data_path;
if(preg_match("/\.({$config['cf_image_extension']})$/i", $srcfile) && is_file($srcfile)) {
@ -107,6 +110,9 @@ function get_view_thumbnail($contents)
else
$data_path = $p['path'];
if(!preg_match('/^\/'.G4_DATA_DIR.'/', $data_path))
continue;
$srcfile = G4_PATH.$data_path;
if(is_file($srcfile)) {