Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,16 @@ public function __construct($options = array()) {
*/
public function render($options = array()) {

return $this->instance->render($options["pattern"], $options["data"]);
$result = $this->instance->render($options["pattern"], $options["data"]);
// This error handler catches files that didn't render using any of the loaders.
// The most common scenario is when a file's contents get passed to and through `Twig_Loader_String` and
// outputs the raw Twig file contents like `@atoms/buttons/button.twig`.
// @todo Remove this once `Twig_Loader_String` is removed.
if (strpos($result, "@") === 0) {
throw new \Twig_Error_Loader("Twig file not found: " . $result . "\n");
} else {
return $result;
}

}

Expand Down