holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing grid name when importing template, fix missing label options

Browse Source
This commit is contained in:
Nathan Gray 2013-01-10 23:05:22 +00:00
parent d159f2b51f
commit ca7e4b66b9
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etemplate/inc/class.etemplate_old.inc.php
View File

@ -1225,7 +1225,20 @@ class etemplate_old extends boetemplate
{ {
case 'label': // size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title] case 'label': // size: [b[old]][i[talic]],[link],[activate_links],[label_for],[link_target],[link_popup_size],[link_title]
if (is_array($value)) break; if (is_array($value)) break;
list($style,$extra_link,$activate_links,$label_for,$extra_link_target,$extra_link_popup,$extra_link_title) = self::csv_split($cell_options,7); if($cell_options)
{
list($style,$extra_link,$activate_links,$label_for,$extra_link_target,$extra_link_popup,$extra_link_title) = self::csv_split($cell_options,7);
}
else
{
$style = $cell['font_style'];
$extra_link = $cell['href'];
$activate_links = $cell['activate_links'];
$label_for = $cell['for'];
$extra_link_target = $cell['extra_link_target'];
$extra_link_popup = $cell['extra_link_popup'];
$extra_link_title = $cell['extra_link_title'];
}
$value = strlen($value) > 1 && !$cell['no_lang'] ? lang($value) : $value; $value = strlen($value) > 1 && !$cell['no_lang'] ? lang($value) : $value;
$value = nl2br(html::htmlspecialchars($value)); $value = nl2br(html::htmlspecialchars($value));
if ($activate_links) $value = html::activate_links($value); if ($activate_links) $value = html::activate_links($value);

1
etemplate/inc/class.xul_io.inc.php
View File

@ -559,6 +559,7 @@ class xul_io
} }
$grid = array( // empty grid $grid = array( // empty grid
'type' => 'grid', 'type' => 'grid',
'name' => $attr['name'],
'data' => array(), 'data' => array(),
'cols' => 0, 'cols' => 0,
'rows' => 0, 'rows' => 0,