deploy: 32e9fbc

Author: kodiakhq

files/redaxo-main/redaxo/src/core/boot.php.txt

@@ -92,7 +92,7 @@ require_once rex_path::core('functions/function_rex_globals.php');
 require_once rex_path::core('functions/function_rex_other.php');
 
 // ----------------- VERSION
-rex::setProperty('version', '5.17.1');
+rex::setProperty('version', '5.18.0');
 
 $cacheFile = rex_path::coreCache('config.yml.cache');
 $configFile = rex_path::coreData('config.yml');

files/redaxo-main/redaxo/src/core/lib/be/controller.php.txt

@@ -450,7 +450,16 @@ class rex_be_controller
      */
     public static function includeCurrentPageSubPath(array $context = [])
     {
-        $path = rex_type::string(self::requireCurrentPageObject()->getSubPath());
+        $page = self::requireCurrentPageObject();
+        $path = $page->getSubPath();
+        if (null === $path) {
+            throw new rex_exception(sprintf(
+                $page instanceof rex_be_page_main
+                    ? 'Current page "%s" is a main page and therefore has no sub-path.'
+                    : 'Current page "%s" does not have a sub-path.',
+                $page->getFullKey(),
+            ));
+        }
 
         if ('.md' !== strtolower(substr($path, -3))) {
             return self::includePath($path, $context);
@@ -471,7 +480,7 @@ class rex_be_controller
         $content = $fragment->parse('core/page/docs.php');
 
         $fragment = new rex_fragment();
-        $fragment->setVar('title', self::requireCurrentPageObject()->getTitle(), false);
+        $fragment->setVar('title', $page->getTitle(), false);
         $fragment->setVar('body', $content, false);
         echo $fragment->parse('core/page/section.php');