Merge branch 'g4s'

2013-06-13 18:10:38 +09:00
parent 08beb5a213 0a0ff36b41
commit c02409fdd2
3 changed files with 411 additions and 278 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -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) {