}
// Output HTML code directly or 'render' it. You addionally switch the new-line character off
-function outputHtml ($htmlCode, $newLine = TRUE) {
+function outputHtml ($htmlCode = NULL, $newLine = TRUE) {
// Init output
if (!isset($GLOBALS['__output'])) {
$GLOBALS['__output'] = '';
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getOutputMode()=' . getOutputMode() . ',htmlCode(length)=' . strlen($htmlCode) . ',output(length)=' . strlen($GLOBALS['__output']));
// Is there HTML-Code here?
- if (!empty($htmlCode)) {
+ if ((!is_null($htmlCode)) && (!empty($htmlCode))) {
// Yes, so we handle it as you have configured
switch (getOutputMode()) {
case 'render':
$pageTitle .= ' {%config,trim=title_middle%} {DQUOTE} . getModuleTitle(getModule()) . {DQUOTE}';
} // END - if
- // Add title from what file
- $menuMode = '';
- if (getModule() == 'login') {
- $menuMode = 'member';
- } elseif (getModule() == 'index') {
- $menuMode = 'guest';
- } elseif (getModule() == 'admin') {
- $menuMode = 'admin';
- } elseif (getModule() == 'sponsor') {
- $menuMode = 'sponsor';
- }
+ // Get menu mode from module
+ $menuMode = getMenuModeFromModule();
// Add middle part (always in admin area!)
if ((!empty($menuMode)) && ((isWhatTitleEnabled()) || ($menuMode == 'admin'))) {