- Merge [3732].

sebastianbergmann · Sep 4, 2008 · 96475ef · 96475ef
1 parent 738e7ca
commit 96475ef
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/PHPUnit/Util/Template.php b/PHPUnit/Util/Template.php
@@ -98,13 +98,15 @@ public function setFile($file)
     {
         $distFile = $file . '.dist';
 
-        if (file_exists($distFile)) {
-            $file = $distFile;
-        }
-
         if (file_exists($file)) {
             $this->template = file_get_contents($file);
-        } else {
+        }
+
+        else if (file_exists($distFile)) {
+            $this->template = file_get_contents($distFile);
+        }
+
+        else {
             throw new InvalidArgumentException(
               'Template file could not be loaded.'
             );