From 99207fca13be08050879007fd16edca2f0074048 Mon Sep 17 00:00:00 2001
From: Henrik Maier <hwmaier@gmail.com>
Date: Thu, 5 Nov 2015 13:37:06 +1000
Subject: [PATCH 1/2] Don't create <style> or <script> tags for empty inline
 CSS or inline JS

---
 system/src/Grav/Common/Assets.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index 50e4ba4a2..16822b990 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -413,7 +413,7 @@ class Assets
         }
 
         $key = md5($asset);
-        if (is_string($asset) && !array_key_exists($key, $this->inline_css)) {
+        if ($asset && is_string($asset) && !array_key_exists($key, $this->inline_css)) {
             $this->inline_css[$key] = $data;
         }
 
@@ -460,7 +460,7 @@ class Assets
         }
 
         $key = md5($asset);
-        if (is_string($asset) && !array_key_exists($key, $this->inline_js)) {
+        if ($asset && is_string($asset) && !array_key_exists($key, $this->inline_js)) {
             $this->inline_js[$key] = $data;
         }
 

From ed8b08a9e4d01a595a472fa538c8917fd82bcd20 Mon Sep 17 00:00:00 2001
From: Benny <Sommerregen@users.noreply.github.com>
Date: Tue, 10 Nov 2015 11:19:30 +0100
Subject: [PATCH 2/2] Fixes #432 (Theme autoloading doesn't seem to work)

---
 system/src/Grav/Common/Themes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
index add87d3be..4c5748be6 100644
--- a/system/src/Grav/Common/Themes.php
+++ b/system/src/Grav/Common/Themes.php
@@ -284,11 +284,11 @@ class Themes extends Iterator
             $class = substr($class, strlen($prefix));
 
             // Replace namespace tokens to directory separators
-            $path = ltrim(preg_replace('#\\\|_(?!.+\\\)#', '/', $class), '/');
+            $path = strtolower(ltrim(preg_replace('#\\\|_(?!.+\\\)#', '/', $class), '/'));
             $file = $locator->findResource("themes://{$path}/{$path}.php");
 
             // Load class
-            if (stream_resolve_include_path($file)) {
+            if (file_exists($file)) {
               return include_once($file);
             }
         }