[geeklog-cvs] Geeklog-1.x/system/classes template.class.php, 1.8, 1.9

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv58956

Modified Files:
	template.class.php 
Log Message:
Test for template was failing on windows when parm included the full path.

Index: template.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/template.class.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** template.class.php	25 Nov 2007 06:59:56 -0000	1.8
--- template.class.php	26 Jun 2008 00:26:43 -0000	1.9
***************
*** 824,833 ****
        echo "<p><b>filename:</b> filename = $filename</p>\n";
      }
-     if (substr($filename, 0, 1) != "/") {
-       $filename = $this->root."/".$filename;
-     }
  
      if (!file_exists($filename)) {
!       $this->halt("filename: file $filename does not exist.");
      }
      return $filename;
--- 824,835 ----
        echo "<p><b>filename:</b> filename = $filename</p>\n";
      }
  
+     // Test if file exist and add physical path as 2nd test
      if (!file_exists($filename)) {
!         // Try appending file to template root
!         $filename = $this->root."/".$filename;
!         if (!file_exists($filename)) {
!             $this->halt("filename: file $filename does not exist.");
!         }
      }
      return $filename;