Handle CRLF and BOM carefuly.

shvetsgroup · Feb 8, 2019 · 98b8f28 · 98b8f28
1 parent 3454953
commit 98b8f28
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Builders/Renderers/IncludeRenderer.php b/src/Builders/Renderers/IncludeRenderer.php
@@ -35,12 +35,17 @@ public function renderContent($content, Page $page, PageRegistry $registry)
                 }
             }
             else {
-                $contents = rtrim($files->get($full_path), "\n");
+                $contents = $files->get($full_path);
+                // Remove BOM, if any.
+                $contents = preg_replace('/^\x{FEFF}/u', '', $contents);
+                // Normalize line-endings.
+                $contents = preg_replace("%(\r\n|\r|\n)%", "\n", $contents);
+                $contents = rtrim($contents, "\n");
             }
 
             return $contents;
         }, $content);
 
         return $content;
     }
-}
+}