Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10016
Modified Files:
serendipity_functions.inc.php
Log Message:
This fixes something, I think. If not, it is at least easier to read.
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- serendipity_functions.inc.php 18 Feb 2004 12:20:14 -0000 1.214
+++ serendipity_functions.inc.php 23 Feb 2004 07:27:44 -0000 1.215
@@ -96,16 +96,17 @@
function serendipity_getTemplateFile($file) {
global $serendipity;
- $templateFile = $serendipity['templatePath'] . $serendipity['CONFIG']['template'] . '/' . $file;
-
- if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
- return $serendipity['serendipityHTTPPath'] . $templateFile;
- }
+ $directories = array(
+ $serendipity['CONFIG']['template'] . '/',
+ 'default/'
+ );
- $templateFile = $serendipity['serendipityPath'] . $serendipity['templatePath'] . 'default/' . $file;
+ foreach ($directories as $directory) {
+ $templateFile = $serendipity['templatePath'] . $directory . $file;
- if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
- return $serendipity['serendipityHTTPPath'] . $templateFile;
+ if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
+ return $serendipity['serendipityHTTPPath'] . $templateFile;
+ }
}
}
|