aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/profilefields/manager.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-22 20:42:14 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-22 20:42:14 +0200
commitb41a730471f2fad7a2466688d323c5563848c640 (patch)
tree9833cd5e8bc4c3e91749d3d2fc78b52300292b8f /phpBB/phpbb/profilefields/manager.php
parentd421187cb60aeb7eddda2287702a8835ddc018c3 (diff)
parente5b74145897c314a7512f2215896f1db4eebb0b1 (diff)
downloadforums-b41a730471f2fad7a2466688d323c5563848c640.tar
forums-b41a730471f2fad7a2466688d323c5563848c640.tar.gz
forums-b41a730471f2fad7a2466688d323c5563848c640.tar.bz2
forums-b41a730471f2fad7a2466688d323c5563848c640.tar.xz
forums-b41a730471f2fad7a2466688d323c5563848c640.zip
Merge pull request #2635 from PayBas/ticket/12758
[ticket/12758] Add show_results var to core.search_modify_rowset * PayBas/ticket/12758: [ticket/12758] Add @changed to doc block [ticket/12758] Add show_results var to core.search_modify_rowset
Diffstat (limited to 'phpBB/phpbb/profilefields/manager.php')
0 files changed, 0 insertions, 0 deletions
/td> parentb2f8950309dd68d239818636b125b4f75dde169a (diff)downloaddrakx-b8697fd33f14a3f4ad1d7ecba59c1ca8853bc01f.tar
drakx-b8697fd33f14a3f4ad1d7ecba59c1ca8853bc01f.tar.gz
drakx-b8697fd33f14a3f4ad1d7ecba59c1ca8853bc01f.tar.bz2
drakx-b8697fd33f14a3f4ad1d7ecba59c1ca8853bc01f.tar.xz
drakx-b8697fd33f14a3f4ad1d7ecba59c1ca8853bc01f.zip
fix bugzilla #12996
Diffstat
-rw-r--r--perl-install/network/shorewall.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index cafb128be..9c9628635 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -67,9 +67,9 @@ sub default_interfaces {
my @l = detect_devices::getNet() or return;
my $modules_conf = modules::any_conf->read;
-my @all_cards = network::ethernet::get_eth_cards($modules_conf);
-my %net_devices = network::ethernet::get_eth_cards_names(@all_cards);
-put_in_hash(\%net_devices, { 'ppp+' => 'ppp+', 'ippp+' => 'ippp+' });
+ my @all_cards = network::ethernet::get_eth_cards($modules_conf);
+ my $net_devices = network::ethernet::get_eth_cards_names(@all_cards);
+ put_in_hash($net_devices, { 'ppp+' => 'ppp+', 'ippp+' => 'ippp+' });
$in->ask_from('',
N("Please enter the name of the interface connected to the internet.
@@ -79,7 +79,7 @@ Examples:
eth0, or eth1 for cable connection,
ippp+ for a isdn connection.
"),
- [ { label => N("Net Device"), val => \$card_netconnect, list => [ sort keys %net_devices ], format => sub { $net_devices{$_[0]} || $_[0] }, not_edit => 0 } ]);
+ [ { label => N("Net Device"), val => \$card_netconnect, list => [ sort keys %$net_devices ], format => sub { $net_devices->{$_[0]} || $_[0] }, not_edit => 0 } ]);
$conf{net_interface} = $card_netconnect;
$conf{loc_interface} = [ grep { $_ ne $conf{net_interface} } @l ];