Update Document.php

Author: hiteshaggarwal

astroid/astroid-framework/framework/library/astroid/Document.php

@@ -29,27 +29,43 @@ class Document
     protected $minify_js = false;
     protected $minify_html = false;
     protected static $_fontawesome = false;
+    protected static $_layout_paths = [];
 
     public function __construct()
     {
         $params = Framework::getTemplate()->getParams();
         $this->minify_css = $params->get('minify_css', false);
         $this->minify_js = $params->get('minify_js', false);
         $this->minify_html = $params->get('minify_html', false);
+
+
+        $template = Framework::getTemplate();
+        $this->addLayoutPath(JPATH_LIBRARIES . '/astroid/framework/frontend/');
+        $this->addLayoutPath(JPATH_SITE . '/templates/' . $template->template . '/html/frontend/');
+    }
+
+    public function addLayoutPath($path)
+    {
+        self::$_layout_paths[] = $path;
     }
 
     public function include($section, $data = [], $return = false)
     {
-        $template = Framework::getTemplate();
         $path = null;
         $name = str_replace('.', '/', $section);
         if (Framework::isAdmin() && file_exists(JPATH_LIBRARIES . '/astroid/framework/layouts/' . $name . '.php')) {
             $path = JPATH_LIBRARIES . '/astroid/framework/layouts';
-        } else if (file_exists(JPATH_SITE . '/templates/' . $template->template . '/html/frontend/' . $name . '.php')) {
-            $path = JPATH_SITE . '/templates/' . $template->template . '/html/frontend';
-        } else if (file_exists(JPATH_LIBRARIES . '/astroid/framework/frontend/' . $name . '.php')) {
-            $path = JPATH_LIBRARIES . '/astroid/framework/frontend';
         } else {
+            foreach (self::$_layout_paths as $layout_path) {
+                $layout_path = substr($layout_path, -1) == '/' ? $layout_path : $layout_path . '/';
+                if (file_exists($layout_path . $name . '.php')) {
+                    $path = $layout_path;
+                    break;
+                }
+            }
+        }
+
+        if ($path === null) {
             return '';
         }