From 06aa7a266cd59b39b122ab176c101bf8fb2be541 Mon Sep 17 00:00:00 2001 From: shish Date: Wed, 19 Dec 2007 10:56:08 +0000 Subject: [PATCH] as of php 5.2.5, no custom themelets = false, not array of length zero -_- git-svn-id: file:///home/shish/svn/shimmie2/trunk@668 7f39781d-f577-437e-ae19-be835c7a54ca --- index.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index b8ead703..3ec226c1 100644 --- a/index.php +++ b/index.php @@ -47,7 +47,10 @@ if(!file_exists("themes/$_theme")) $_theme = "default"; require_once "themes/$_theme/page.class.php"; require_once "themes/$_theme/layout.class.php"; require_once "themes/$_theme/themelet.class.php"; -$themelets = array_merge(glob("ext/*/theme.php"), glob("themes/$_theme/*.theme.php")); + +$themelets = glob("ext/*/theme.php"); +$custom_themelets = glob("themes/$_theme/*.theme.php"); +if($custom_themelets) $themelets = array_merge($themelets, $custom_themelets); foreach($themelets as $filename) { require_once $filename; }