summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-26 13:19:21 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-26 13:19:21 +0000
commit075a25662ac35960af17d0554303d74e45952812 (patch)
tree3fd50c65f2db2dc332137daec7b48bd649d1373a
parentf8d87de2feed7d78ac2fe4c10bc00d9e3b43f2e5 (diff)
downloaddrakx-075a25662ac35960af17d0554303d74e45952812.tar
drakx-075a25662ac35960af17d0554303d74e45952812.tar.gz
drakx-075a25662ac35960af17d0554303d74e45952812.tar.bz2
drakx-075a25662ac35960af17d0554303d74e45952812.tar.xz
drakx-075a25662ac35960af17d0554303d74e45952812.zip
(ask_from_normalize) do not display Help buttons in standalone mode
since we do not have any contents
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/interactive.pm3
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 45367c0cb..dfb965178 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- do not display Help buttons in standalone mode since we do not have
+ any contents
- factorize WebKit code with mcc
Version 11.54.2 - 26 September 2008
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 3ac1a208b..62706f25f 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -482,6 +482,9 @@ sub ask_from_normalize {
}
$common->{interactive_help} ||= $o->{interactive_help};
$common->{interactive_help} ||= $common->{interactive_help_id} && $o->interactive_help_sub_get_id($common->{interactive_help_id});
+ if (!$::isInstall) {
+ delete $common->{$_} foreach qw(interactive_help interactive_help_id);
+ }
$common->{advanced_label} ||= N("Advanced");
$common->{advanced_label_close} and log::l("advanced_label_close is not used anymore");
$common->{$_} = $common->{$_} ? [ map { $o->adapt_markup($_) } deref($common->{$_}) ] : []