Fixed loading issues with improperly named themes #1373

getgrav · Mar 22, 2017 · c153039 · c153039
1 parent 88ccc25
commit c153039
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
@@ -316,6 +316,15 @@ protected function autoloadTheme($class)
             // Remove prefix from class
             $class = substr($class, strlen($prefix));
 
+            // Try Old style theme classes
+            $path = strtolower(ltrim(preg_replace('#\\\|_(?!.+\\\)#', '/', $class), '/'));
+            $file = $this->grav['locator']->findResource("themes://{$path}/{$path}.php");
+
+            // Load class
+            if (file_exists($file)) {
+                return include_once($file);
+            }
+
             // Replace namespace tokens to directory separators
             $path = $this->grav['inflector']->hyphenize(ltrim($class,"\\"));
             $file = $this->grav['locator']->findResource("themes://{$path}/{$path}.php");