fix bug with default theme. Only use Carl's theme for the backend.

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 60ed69cbb8ed61430bb3bb1a545d48046728df9e..23687bca7d7e2689170bb6e47221c8d335a9c940 100644 (file)
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -249,7 +249,7 @@ function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath') {
     $directories = array();
 
     $directories[] = isset($serendipity['template']) ? $serendipity['template'] . '/' : '';
-    if (isset($serendipity['template_engine']) && $serendipity['template_engine'] != 'default') {
+    if (isset($serendipity['template_engine']) && (stristr($file, 'admin/') === false || $serendipity['template_engine'] != 'default')) {
          $directories[] = $serendipity['template_engine'] . '/';
     }
     $directories[] = $serendipity['defaultTemplate'] .'/';