Fixes error with casting template name as array to string

tonik · Apr 11, 2017 · 358c4ba · 358c4ba
1 parent 2ad2950
commit 358c4ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Gin/Template/Template.php b/src/Gin/Template/Template.php
@@ -81,6 +81,12 @@ public function doActions()
             return;
         }
 
+        // Use first template name, if template
+        // file is an array, but is not named.
+        if (is_array($this->file) && isset($this->file[0])) {
+            return do_action("get_template_part_{$this->file[0]}", $this->file[0], null);
+        }
+
         do_action("get_template_part_{$this->file}", $this->file, null);
     }
 
@@ -125,7 +131,7 @@ public function getFilename($extension = '.php')
 
         // Use first template name, if template
         // file is an array, but is not named.
-        if (is_array($this->file)) {
+        if (is_array($this->file) && isset($this->file[0])) {
             return "{$this->file[0]}{$extension}";
         }
 

diff --git a/tests/Gin/Template/TemplateTest.php b/tests/Gin/Template/TemplateTest.php
@@ -3,8 +3,8 @@
 use Brain\Monkey\Functions;
 use Brain\Monkey\WP\Actions;
 use Tonik\Gin\Foundation\Config;
-use Tonik\Gin\Foundation\Exception\FileNotFoundException;
 use Tonik\Gin\Template\Template;
+use Tonik\Gin\Foundation\Exception\FileNotFoundException;
 
 class TemplateTest extends TestCase
 {