aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/module/update_database/task/update.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-09-24 10:03:58 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-09-24 10:03:58 +0200
commite02dc7a9c154b059b2d89717fb6f3502c94100a2 (patch)
tree3e6d0e858c71eabd3ff8dcea74c9b320c6daad21 /phpBB/phpbb/install/module/update_database/task/update.php
parent4db52518a901ffcd31957d81c245152d1123fdd8 (diff)
parent931582aad9c041ebc9ae51d9a2664b4944a31be8 (diff)
downloadforums-e02dc7a9c154b059b2d89717fb6f3502c94100a2.tar
forums-e02dc7a9c154b059b2d89717fb6f3502c94100a2.tar.gz
forums-e02dc7a9c154b059b2d89717fb6f3502c94100a2.tar.bz2
forums-e02dc7a9c154b059b2d89717fb6f3502c94100a2.tar.xz
forums-e02dc7a9c154b059b2d89717fb6f3502c94100a2.zip
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/install/module/update_database/task/update.php')
0 files changed, 0 insertions, 0 deletions
;id=0aa7a9e98c3b51085c87aa13d61eef8e3f694626'>06c3462cb7af3adb37d3a4606dd43d2604b88eec /perl-install/interactive.pm parent951e65ef820631665dbeddf6cfb43afce034efb9 (diff)downloaddrakx-0aa7a9e98c3b51085c87aa13d61eef8e3f694626.tar
drakx-0aa7a9e98c3b51085c87aa13d61eef8e3f694626.tar.gz
drakx-0aa7a9e98c3b51085c87aa13d61eef8e3f694626.tar.bz2
drakx-0aa7a9e98c3b51085c87aa13d61eef8e3f694626.tar.xz
drakx-0aa7a9e98c3b51085c87aa13d61eef8e3f694626.zip
*** empty log message ***
Diffstat (limited to 'perl-install/interactive.pm')
-rw-r--r--perl-install/interactive.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 9e3d8b6a3..3b296a982 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -107,7 +107,7 @@ sub ask_from_entry {
my ($o, $title, $message, $label, $def, %callback) = @_;
$message = ref $message ? $message : [ $message ];
- $o->ask_from_entries($title, $message, [ $label ], [ $def ], %callback);
+ first ($o->ask_from_entries($title, $message, [ $label ], [ $def ], %callback));
}
sub ask_from_entries($$$$;$%) {
@@ -126,11 +126,12 @@ sub ask_from_entries_ref($$$$;$%) {
my ($o, $title, $message, $l, $val, %callback) = @_;
$message = ref $message ? $message : [ $message ];
+
my $val_hash = [ map {
if ((ref $_) eq "SCALAR") {
{ val => $_ }
} else {
- ($_->{list} && @{$_->{list}}) ?
+ ($_->{list} && (@{$_->{list}} > 1)) ?
{ %$_, type => "list"} : $_;
}
} @$val ];