diff options
| author | Andras Timar <atimar@suse.com> | 2013-08-26 11:10:47 -0700 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-08-26 11:14:58 -0700 |
| commit | 3f29153ab6535d5e2fd975540dd39f4f61e211fc (patch) | |
| tree | a332f9da80d3765d18a6f32635d26b3a7a58e890 | |
| parent | 405edb013db8ecda701d99cc4e04d154929d152d (diff) | |
fdo#68158 fix quote escaping problems
It was not clear, why pre2par escaped quote, because it was already
escaped in .ulf file. I think that the Tooltip/Description cases were
simply overlooked, because at other places other kind of strings
were processed, i.e. \" was replaced to ".
Change-Id: Idcd8c8cb627dbfd0e3cc9961b19cae236de3e25f
| -rw-r--r-- | solenv/bin/modules/installer/windows/feature.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/shortcut.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/pre2par/language.pm | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm index 602beaf68576..d023a7415a10 100644 --- a/solenv/bin/modules/installer/windows/feature.pm +++ b/solenv/bin/modules/installer/windows/feature.pm @@ -387,6 +387,7 @@ sub create_feature_table $feature{'feature_parent'} = get_feature_parent($onefeature); $feature{'Title'} = $onefeature->{'Name'}; $feature{'Description'} = $onefeature->{'Description'}; + $feature{'Description'} =~ s/\\\"/\"/g; # no more masquerading of '"' $feature{'Display'} = get_feature_display($onefeature); $feature{'Level'} = get_feature_level($onefeature); $feature{'Directory_'} = get_feature_directory($onefeature); diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm index 4a8526e4b4d0..b32c772b6471 100644 --- a/solenv/bin/modules/installer/windows/shortcut.pm +++ b/solenv/bin/modules/installer/windows/shortcut.pm @@ -199,6 +199,7 @@ sub get_shortcut_description my $description = ""; if ( $shortcut->{'Tooltip'} ) { $description = $shortcut->{'Tooltip'}; } + $description =~ s/\\\"/\"/g; # no more masquerading of '"' return $description; } diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm index e38ef80d7158..842c86d4f955 100644 --- a/solenv/bin/modules/pre2par/language.pm +++ b/solenv/bin/modules/pre2par/language.pm @@ -37,7 +37,6 @@ sub get_language_string_from_language_block if ( ${$language_block}[$i] =~ /^\s*$language\s*\=\s*\"(.*)\"\s*$/ ) { $newstring = $1; - $newstring =~ s/\"/\\\"/g; # masquerading all '"' in the string $newstring = "\"" . $newstring . "\""; last; } |