From 5d6dc9a8b1d4b25f36a6d1b55c9059a5c531a592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Goetz?= Date: Mon, 25 Jan 2016 16:10:13 +0100 Subject: [PATCH] Take templates from inside .phar if dir doesn't exist --- daux.phar | Bin 877442 -> 877507 bytes libs/Format/HTML/Template.php | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/daux.phar b/daux.phar index b6da78cc1ea3c6cf83f6c179da8ad40dd53f49f7..aee9b962db38d73cb767c8ed09baab109b36153f 100755 GIT binary patch delta 4277 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 Sa3}PI#HR%>r0n#<^#20*(l1>A diff --git a/libs/Format/HTML/Template.php b/libs/Format/HTML/Template.php index 86c7bbb..5bb40ab 100644 --- a/libs/Format/HTML/Template.php +++ b/libs/Format/HTML/Template.php @@ -15,6 +15,11 @@ class Template */ public function __construct($base, $theme) { + // Use templates from the phar archive if the templates dir doesn't exist. + if (!is_dir($base)) { + $base = 'phar://daux.phar/templates'; + } + // Create new Plates instance $this->engine = new Engine($base); if (!is_dir($theme)) {