[php-blog-cvs] serendipity serendipity_functions.inc.php,1.211,1.212

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2102

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Simplify.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- serendipity_functions.inc.php	17 Feb 2004 16:39:55 -0000	1.211
+++ serendipity_functions.inc.php	17 Feb 2004 17:12:42 -0000	1.212
@@ -95,11 +95,17 @@
 
 function serendipity_getTemplateFile($file) {
     global $serendipity;
-    if ( file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $serendipity['CONFIG']['template'] . '/'. $file) ) {
-        return $serendipity['serendipityHTTPPath'] . $serendipity['templatePath'] . $serendipity['CONFIG']['template'] . '/' . $file;
+
+    $templateFile = $serendipity['templatePath'] . $serendipity['CONFIG']['template'] . '/' . $file;
+
+    if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
+        return $serendipity['serendipityHTTPPath'] . $templateFile;
     }
-    if ( file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/'.  $file) ) {
-        return $serendipity['serendipityHTTPPath'] . $serendipity['templatePath'] . 'default/' . $file;
+
+    $templateFile = $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/' . $file;
+
+    if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
+        return $serendipity['serendipityHTTPPath'] . $templateFile;
     }
 }