aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textreparser/base.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-09-01 13:33:00 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-09-01 13:33:00 +0200
commit4db585a4cb2e5359074a82ef088574609155294b (patch)
tree20adf86919e333451704cf9127d8debfdf52d7b4 /phpBB/phpbb/textreparser/base.php
parent9c15594fe498a8a1640bb89aa0c93800918a9798 (diff)
parent88ec8cdcc6427b12a496c5f2813ec24594f38133 (diff)
downloadforums-4db585a4cb2e5359074a82ef088574609155294b.tar
forums-4db585a4cb2e5359074a82ef088574609155294b.tar.gz
forums-4db585a4cb2e5359074a82ef088574609155294b.tar.bz2
forums-4db585a4cb2e5359074a82ef088574609155294b.tar.xz
forums-4db585a4cb2e5359074a82ef088574609155294b.zip
Merge pull request #5666 from mrgoldy/ticket/16084
[ticket/16084] Remove redundant backup radio button
Diffstat (limited to 'phpBB/phpbb/textreparser/base.php')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-31 00:19:54 +0000
r Blin <oblin@mandriva.org>2006-02-23 14:27:15 +0000 commite225854a2b8d9119d450154b7b6d2e6021be58f3 (patch) tree668666e25e0390b87105a1857e97cf27b615e4ae /perl-install parentc747afe416b1c8fd2323d3eba9fe05dfcbe70414 (diff)downloaddrakx-e225854a2b8d9119d450154b7b6d2e6021be58f3.tar
drakx-e225854a2b8d9119d450154b7b6d2e6021be58f3.tar.gz
drakx-e225854a2b8d9119d450154b7b6d2e6021be58f3.tar.bz2
drakx-e225854a2b8d9119d450154b7b6d2e6021be58f3.tar.xz
drakx-e225854a2b8d9119d450154b7b6d2e6021be58f3.zip
remove untested patch
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm20
1 files changed, 6 insertions, 14 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 1b4cb7c69..469b6234e 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -722,19 +722,11 @@ sub acceptLicense {
my ($o) = @_;
require install_messages;
- $o->{release_notes} = join("\n\n", map {
- if ($::isInstall) {
- my $f = install_any::getFile($_);
- $f && cat__($f);
- } else {
- my $file = $_;
- my $d = find { -e "$_/$file" } glob_("/usr/share/doc/*-release-*");
- print cat_("$d/$file");
- $d && cat_("$d/$file");
- }
- } 'release-notes.txt', 'release-notes.' . arch() . '.txt');
-
- print $o->{release_notes};
+ $o->{release_notes} = join("\n\n", map {
+ my $f = install_any::getFile($_);
+ $f && cat__($f);
+ } 'release-notes.txt', 'release-notes.' . arch() . '.txt') if $::isInstall;
+
return if $o->{useless_thing_accepted};
my $r = $::testing ? 'Accept' : 'Refuse';
@@ -744,7 +736,7 @@ sub acceptLicense {
cancel => N("Quit"),
messages => formatAlaTeX(install_messages::main_license() . "\n\n\n" . install_messages::warning_about_patents()),
interactive_help_id => 'acceptLicense',
- more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ],
+ if_(!$::globetrotter, more_buttons => [ [ N("Release Notes"), sub { $o->ask_warn(N("Release Notes"), $o->{release_notes}) }, 1 ] ]),
callbacks => { ok_disabled => sub { $r eq 'Refuse' } },
},
[ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list', format => sub { translate($_[0]) } } ])
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-31 00:19:54 +0000