From: Roland Häder Date: Sat, 27 Feb 2010 21:06:06 +0000 (+0000) Subject: Fix for non-working theme-selector X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f6cb960b3cf0a17ad2479cbda93b52dd25fd61e;p=mailer.git Fix for non-working theme-selector --- diff --git a/inc/inc-functions.php b/inc/inc-functions.php index c31c7eb78b..d93731ab0d 100644 --- a/inc/inc-functions.php +++ b/inc/inc-functions.php @@ -57,7 +57,13 @@ function setIncludePool ($pool, $includePool) { // Getter for INC_POOL function getIncludePool ($pool) { //* DEBUG: */ print __FUNCTION__.':pool='.$pool.'
'; - return $GLOBALS['inc_pool'][$pool]; + if (isset($GLOBALS['inc_pool'][$pool])) { + // Return found pool (array) + return $GLOBALS['inc_pool'][$pool]; + } else { + // Return empty array if not found + return array(); + } } // Count INC_POOL diff --git a/inc/libs/theme_functions.php b/inc/libs/theme_functions.php index 9d97d505c3..a1b563054a 100644 --- a/inc/libs/theme_functions.php +++ b/inc/libs/theme_functions.php @@ -40,7 +40,7 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Create a selection box with installed and activated themes or all if admin function generateThemeSelectionBox () { @@ -49,9 +49,9 @@ function generateThemeSelectionBox () { $mod = getModule(); // Construction URL - $formAction = "{%url=modules.php?module=" . $mod; - if (!empty($what)) $formAction .= "&what=" . $what; - $formAction = '%}'; + $formAction = '{%url=modules.php?module='. $mod; + if (!empty($what)) $formAction .= '&what=' . $what; + $formAction .= '%}'; // Initialize array $themesArray = array( diff --git a/templates/de/html/admin/admin_theme_edit.tpl b/templates/de/html/admin/admin_theme_edit.tpl index 2b2b02396b..1197c9fd21 100644 --- a/templates/de/html/admin/admin_theme_edit.tpl +++ b/templates/de/html/admin/admin_theme_edit.tpl @@ -7,17 +7,15 @@ {--THEME_NAME--} {--THEME_ACTIVE--} {--THEME_AUTHOR--} - {--THEME_URL--} {--THEME_VERSION--} $content - - + + + + + diff --git a/templates/de/html/admin/admin_theme_edit_row.tpl b/templates/de/html/admin/admin_theme_edit_row.tpl index 1314d265b6..22dce6d40f 100644 --- a/templates/de/html/admin/admin_theme_edit_row.tpl +++ b/templates/de/html/admin/admin_theme_edit_row.tpl @@ -18,7 +18,7 @@ $content[url_title] - + v$content[ver] diff --git a/templates/de/html/admin/admin_theme_import_row.tpl b/templates/de/html/admin/admin_theme_import_row.tpl index 5d90018777..4c5891a2f7 100644 --- a/templates/de/html/admin/admin_theme_import_row.tpl +++ b/templates/de/html/admin/admin_theme_import_row.tpl @@ -1,14 +1,14 @@ - $content[unix] - $content[name] - - $content[author] - - - $content[url] - - v$content[version] - - $content[form] - + $content[unix] + $content[name] + + $content[author] + + + $content[url] + + v$content[version] + + $content[form] +