mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
Remove "BLACK DIAMOND SUIT" character from global categories
This commit is contained in:
parent
00b040764d
commit
7f222b165d
@ -757,7 +757,6 @@ class etemplate_widget_nextmatch extends etemplate_widget
|
|||||||
foreach((array)$cats as $cat)
|
foreach((array)$cats as $cat)
|
||||||
{
|
{
|
||||||
$name = str_repeat(' ',2*$cat['level']) . stripslashes($cat['name']);
|
$name = str_repeat(' ',2*$cat['level']) . stripslashes($cat['name']);
|
||||||
if (categories::is_global($cat)) $name .= ' ♦';
|
|
||||||
|
|
||||||
$cat_actions[$cat['id']] = array(
|
$cat_actions[$cat['id']] = array(
|
||||||
'caption' => $name,
|
'caption' => $name,
|
||||||
@ -796,7 +795,6 @@ class etemplate_widget_nextmatch extends etemplate_widget
|
|||||||
if ($cat['parent'] == $parent_id)
|
if ($cat['parent'] == $parent_id)
|
||||||
{
|
{
|
||||||
$name = stripslashes($cat['name']);
|
$name = stripslashes($cat['name']);
|
||||||
if (categories::is_global($cat)) $name .= ' ♦';
|
|
||||||
|
|
||||||
$cat_actions[$cat['id']] = array(
|
$cat_actions[$cat['id']] = array(
|
||||||
'caption' => $name,
|
'caption' => $name,
|
||||||
|
@ -804,7 +804,6 @@ class nextmatch_widget
|
|||||||
foreach((array)$cats as $cat)
|
foreach((array)$cats as $cat)
|
||||||
{
|
{
|
||||||
$name = str_repeat(' ',2*$cat['level']) . stripslashes($cat['name']);
|
$name = str_repeat(' ',2*$cat['level']) . stripslashes($cat['name']);
|
||||||
if (categories::is_global($cat)) $name .= ' ♦';
|
|
||||||
|
|
||||||
$cat_actions[$cat['id']] = array(
|
$cat_actions[$cat['id']] = array(
|
||||||
'caption' => $name,
|
'caption' => $name,
|
||||||
@ -843,7 +842,6 @@ class nextmatch_widget
|
|||||||
if ($cat['parent'] == $parent_id)
|
if ($cat['parent'] == $parent_id)
|
||||||
{
|
{
|
||||||
$name = stripslashes($cat['name']);
|
$name = stripslashes($cat['name']);
|
||||||
if (categories::is_global($cat)) $name .= ' ♦';
|
|
||||||
|
|
||||||
$cat_actions[$cat['id']] = array(
|
$cat_actions[$cat['id']] = array(
|
||||||
'caption' => $name,
|
'caption' => $name,
|
||||||
|
@ -220,10 +220,6 @@ class select_widget
|
|||||||
{
|
{
|
||||||
$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
|
$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
|
||||||
|
|
||||||
if (categories::is_global($cat))
|
|
||||||
{
|
|
||||||
$s .= ' ♦';
|
|
||||||
}
|
|
||||||
$cell['sel_options'][$cat['id']] = empty($cat['description']) ? $s : array(
|
$cell['sel_options'][$cat['id']] = empty($cat['description']) ? $s : array(
|
||||||
'label' => $s,
|
'label' => $s,
|
||||||
'title' => $cat['description'],
|
'title' => $cat['description'],
|
||||||
|
@ -143,7 +143,6 @@ class categories
|
|||||||
if (is_null(self::$global_marker))
|
if (is_null(self::$global_marker))
|
||||||
{
|
{
|
||||||
// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
|
// as et2 adds options with .text(), it can't be entities, but php knows no string literals with utf-8
|
||||||
self::$global_marker = html_entity_decode(' ♦', ENT_NOQUOTES, 'utf-8');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,10 +105,6 @@ class timesheet_wizard_import_csv extends importexport_wizard_basic_import_csv
|
|||||||
foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat) {
|
foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat) {
|
||||||
$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
|
$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
|
||||||
|
|
||||||
if (categories::is_global($cat))
|
|
||||||
{
|
|
||||||
$s .= ' ♦';
|
|
||||||
}
|
|
||||||
$cat_list[$cat['id']] = empty($cat['description']) ? $s : array(
|
$cat_list[$cat['id']] = empty($cat['description']) ? $s : array(
|
||||||
'label' => $s,
|
'label' => $s,
|
||||||
'title' => $cat['description'],
|
'title' => $cat['description'],
|
||||||
|
Loading…
Reference in New Issue
Block a user