diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php index d3c36a43c7..689cd97f3b 100644 --- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php +++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php @@ -757,7 +757,6 @@ class etemplate_widget_nextmatch extends etemplate_widget foreach((array)$cats as $cat) { $name = str_repeat(' ',2*$cat['level']) . stripslashes($cat['name']); - if (categories::is_global($cat)) $name .= ' ♦'; $cat_actions[$cat['id']] = array( 'caption' => $name, @@ -796,7 +795,6 @@ class etemplate_widget_nextmatch extends etemplate_widget if ($cat['parent'] == $parent_id) { $name = stripslashes($cat['name']); - if (categories::is_global($cat)) $name .= ' ♦'; $cat_actions[$cat['id']] = array( 'caption' => $name, diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php index b4f7577aba..55b38b71b8 100644 --- a/etemplate/inc/class.nextmatch_widget.inc.php +++ b/etemplate/inc/class.nextmatch_widget.inc.php @@ -804,7 +804,6 @@ class nextmatch_widget foreach((array)$cats as $cat) { $name = str_repeat(' ',2*$cat['level']) . stripslashes($cat['name']); - if (categories::is_global($cat)) $name .= ' ♦'; $cat_actions[$cat['id']] = array( 'caption' => $name, @@ -843,7 +842,6 @@ class nextmatch_widget if ($cat['parent'] == $parent_id) { $name = stripslashes($cat['name']); - if (categories::is_global($cat)) $name .= ' ♦'; $cat_actions[$cat['id']] = array( 'caption' => $name, diff --git a/etemplate/inc/class.select_widget.inc.php b/etemplate/inc/class.select_widget.inc.php index dac8478280..38442e9b4c 100644 --- a/etemplate/inc/class.select_widget.inc.php +++ b/etemplate/inc/class.select_widget.inc.php @@ -220,10 +220,6 @@ class select_widget { $s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']); - if (categories::is_global($cat)) - { - $s .= ' ♦'; - } $cell['sel_options'][$cat['id']] = empty($cat['description']) ? $s : array( 'label' => $s, 'title' => $cat['description'], diff --git a/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php index c1a821f2b3..7cc7694866 100644 --- a/phpgwapi/inc/class.categories.inc.php +++ b/phpgwapi/inc/class.categories.inc.php @@ -143,7 +143,6 @@ class categories 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 - self::$global_marker = html_entity_decode(' ♦', ENT_NOQUOTES, 'utf-8'); } } diff --git a/timesheet/inc/class.timesheet_wizard_import_csv.inc.php b/timesheet/inc/class.timesheet_wizard_import_csv.inc.php index fcdbcf3817..3cd3400c1b 100644 --- a/timesheet/inc/class.timesheet_wizard_import_csv.inc.php +++ b/timesheet/inc/class.timesheet_wizard_import_csv.inc.php @@ -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) { $s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']); - if (categories::is_global($cat)) - { - $s .= ' ♦'; - } $cat_list[$cat['id']] = empty($cat['description']) ? $s : array( 'label' => $s, 'title' => $cat['description'],