Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

# Conflicts: # composer.lock
getgrav · Aug 16, 2017 · 557a3b8 · 557a3b8
2 parents f89fe0e + 51c3b6d
commit 557a3b8
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 1. [](#bugfix)
     * Allow `session.timetout` field to be set to `0` via blueprints [#1598](https://github.com/getgrav/grav/issues/1598)
     * Fixed `Data::exists()` and `Data::raw()` functions breaking if `Data::file()` hasn't been called with non-null value
+    * Fixed parent theme auto-loading in child themes of Gantry 5
 
 # v1.3.1
 ## 07/19/2017

diff --git a/composer.lock b/composer.lock
diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
@@ -168,7 +168,7 @@ public function current()
     /**
      * Load current theme.
      *
-     * @return Theme|object
+     * @return Theme
      */
     public function load()
     {
@@ -253,7 +253,7 @@ public function configure()
                 stream_wrapper_unregister($scheme);
             }
             $type = !empty($config['type']) ? $config['type'] : 'ReadOnlyStream';
-            if ($type[0] != '\\') {
+            if ($type[0] !== '\\') {
                 $type = '\\RocketTheme\\Toolbox\\StreamWrapper\\' . $type;
             }
 
@@ -301,7 +301,7 @@ protected function loadLanguages(Config $config)
 
                 /** @var \DirectoryIterator $directory */
                 foreach ($iterator as $file) {
-                    if ($file->getExtension() != 'yaml') {
+                    if ($file->getExtension() !== 'yaml') {
                         continue;
                     }
                     $languages[$file->getBasename('.yaml')] = CompiledYamlFile::instance($file->getPathname())->content();
@@ -321,27 +321,36 @@ protected function loadLanguages(Config $config)
      */
     protected function autoloadTheme($class)
     {
-        $prefix = "Grav\\Theme";
+        $prefix = 'Grav\\Theme\\';
         if (false !== strpos($class, $prefix)) {
             // Remove prefix from class
             $class = substr($class, strlen($prefix));
+            $locator = $this->grav['locator'];
 
-            // Try Old style theme classes
-            $path = strtolower(ltrim(preg_replace('#\\\|_(?!.+\\\)#', '/', $class), '/'));
-            $file = $this->grav['locator']->findResource("themes://{$path}/{$path}.php");
+            // First try lowercase version of the classname.
+            $path = strtolower($class);
+            $file = $locator("themes://{$path}/theme.php") ?: $locator("themes://{$path}/{$path}.php");
 
-            // Load class
-            if (file_exists($file)) {
-                return include_once($file);
+            if ($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");
+            $path = $this->grav['inflector']->hyphenize($class);
+            $file = $locator("themes://{$path}/theme.php") ?: $locator("themes://{$path}/{$path}.php");
+
+            // Load class
+            if ($file) {
+                return include_once $file;
+            }
+
+            // Try Old style theme classes
+            $path = strtolower(preg_replace('#\\\|_(?!.+\\\)#', '/', $class));
+            $file = $locator("themes://{$path}/theme.php") ?: $locator("themes://{$path}/{$path}.php");
 
             // Load class
-            if (file_exists($file)) {
-                return include_once($file);
+            if ($file) {
+                return include_once $file;
             }
         }