Merge branch 'develop'

jenskooij · Sep 22, 2017 · 003b9e8 · 003b9e8
2 parents ff96ae8 + bb453fc
commit 003b9e8
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/src/components/BaseComponent.php b/src/components/BaseComponent.php
@@ -189,21 +189,6 @@ private function getTemplatePathFromApplication($application, $templateDir)
             return $templatePath;
         }
 
-        /**
-         * @param $templatePath
-         * @param $obClean
-         * @return mixed|string
-         */
-        private function includeTemplateFile($templatePath, $obClean)
-        {
-            if ($obClean) {
-                include($templatePath);
-                return ob_get_contents();
-            } else {
-                return include($templatePath);
-            }
-        }
-
         /**
          * @param string $templatePath
          * @param Application $application
@@ -220,7 +205,12 @@ private function extractParametersAndIncludeTemplateFile($templatePath, $applica
                 }
             }
             extract($this->parameters);
-            return $this->includeTemplateFile($templatePath, $obClean);
+            if ($obClean) {
+                include($templatePath);
+                return ob_get_contents();
+            } else {
+                return include($templatePath);
+            }
         }
     }
 }