Fixed incorrect setting of acp display vars in some blocks;

Fixed XHTML validation error with blocks that do not have any options;
This commit is contained in:
Marc Alexander
2010-10-22 14:44:53 +00:00
parent 6a47e22ba4
commit f6d3f90e8f
5 changed files with 15 additions and 16 deletions

View File

@@ -497,10 +497,9 @@ class portal_calendar_module
$template->assign_block_vars('events', array(
'EVENT_TITLE' => ($action != 'add') ? ((isset($user->lang[$events[$i]['title']])) ? $user->lang[$events[$i]['title']] : $events[$i]['title']) : '',
'EVENT_DESC' => ($action != 'add') ? $events[$i]['desc'] : '',
'EVENT_URL' => ($action != 'add') ? str_replace('&', '&', $events[$i]['url']) : '',
'EVENT_START' => ($action != 'add') ? $user->format_date($events[$i]['start_time'], 'j. M Y, H:i') : '',
'EVENT_END' => ($action != 'add' && ($events[$i]['start_time'] - $events[$i]['end_time']) != 1) ? $user->format_date($events[$i]['end_time'], 'j. M Y, H:i') : '',
'EVENT_URL' => ($action != 'add' && isset($events[$i]['url']) && !empty($events[$i]['url'])) ? $events[$i]['url'] : '',
'EVENT_URL' => ($action != 'add' && isset($events[$i]['url']) && !empty($events[$i]['url'])) ? str_replace('&', '&', $events[$i]['url']) : '',
'U_EDIT' => $u_action . '&action=edit&id=' . $i,
'U_DELETE' => $u_action . '&action=delete&id=' . $i,
'EVENT_ALL_DAY' => ($events[$i]['end_time'] - $events[$i]['start_time']) ? true : false,

View File

@@ -64,7 +64,10 @@ class portal_link_us_module
function get_template_acp($module_id)
{
return false;
return array(
'title' => 'LINK_US',
'vars' => array(),
);
}
/**

View File

@@ -89,7 +89,10 @@ class portal_stylechanger_module
function get_template_acp($module_id)
{
return array();
return array(
'title' => 'BOARD_STYLE',
'vars' => array(),
);
}
/**

View File

@@ -46,17 +46,6 @@ class portal_user_menu_module
*/
var $language = 'portal_user_menu_module';
function get_template_center($module_id)
{
global $config, $template;
$template->assign_vars(array(
'EXAMPLE' => $config['portal_configname'],
));
return 'modulename_center.html';
}
function get_template_side($module_id)
{
global $config, $template, $user, $auth, $db, $phpEx, $phpbb_root_path;
@@ -157,7 +146,10 @@ class portal_user_menu_module
function get_template_acp($module_id)
{
return false;
return array(
'title' => 'USER_MENU',
'vars' => array(),
);
}
/**