aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2014-06-25 18:53:45 +0200
committerAngelo Naselli <anaselli@linux.it>2014-06-25 18:53:45 +0200
commite8dc873cd36545df3c308c8abf84cd9505b2aa3f (patch)
treed861e452c9110dc0bef5ed50e49b5f68f37c802b
parentcdfeb58a3eba4f25d0ec1890d07345ef8e8cfd3a (diff)
downloadcolin-keep-e8dc873cd36545df3c308c8abf84cd9505b2aa3f.tar
colin-keep-e8dc873cd36545df3c308c8abf84cd9505b2aa3f.tar.gz
colin-keep-e8dc873cd36545df3c308c8abf84cd9505b2aa3f.tar.bz2
colin-keep-e8dc873cd36545df3c308c8abf84cd9505b2aa3f.tar.xz
colin-keep-e8dc873cd36545df3c308c8abf84cd9505b2aa3f.zip
wrong default_item_separator management into ask_fromTreeList
-rw-r--r--lib/AdminPanel/Shared/GUI.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/AdminPanel/Shared/GUI.pm b/lib/AdminPanel/Shared/GUI.pm
index dfef5f0..493c8a7 100644
--- a/lib/AdminPanel/Shared/GUI.pm
+++ b/lib/AdminPanel/Shared/GUI.pm
@@ -696,7 +696,11 @@ sub ask_fromTreeList {
my $treeInfo;
$treeInfo->{collection} = new yui::YItemCollection;
$treeInfo->{default_item} = $info->{default_item} if $info->{default_item};
- $treeInfo->{default_item_separator} = $info->{item_separator} if $info->{item_separator};
+ if ($treeInfo->{default_item} && $info->{item_separator}) {
+ if (index($treeInfo->{default_item}, $info->{item_separator}) != -1) {
+ $treeInfo->{default_item_separator} = $info->{item_separator};
+ }
+ }
my $list2Convert;
$list2Convert->{paths} = $info->{list};
$list2Convert->{separator} = $info->{item_separator} if $info->{item_separator};