aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/adjust_magic_urls.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-17 20:56:41 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-17 20:56:41 +0200
commit0f70c930df3d5fbcfcf1855555757749a9c1a0fb (patch)
tree291dd24fdf33d6ac0a3c3f3855282b8a9e207413 /phpBB/develop/adjust_magic_urls.php
parent3a70bc2c75b28eba2b0b37f0d41ec5de06d2d8cd (diff)
parentae07e80a6513b7277ba4a6a282df8281d2a37576 (diff)
downloadforums-0f70c930df3d5fbcfcf1855555757749a9c1a0fb.tar
forums-0f70c930df3d5fbcfcf1855555757749a9c1a0fb.tar.gz
forums-0f70c930df3d5fbcfcf1855555757749a9c1a0fb.tar.bz2
forums-0f70c930df3d5fbcfcf1855555757749a9c1a0fb.tar.xz
forums-0f70c930df3d5fbcfcf1855555757749a9c1a0fb.zip
Merge remote-tracking branch 'bantu/ticket/10995' into develop-olympus
* bantu/ticket/10995: [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
Diffstat (limited to 'phpBB/develop/adjust_magic_urls.php')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-12 11:15:18 +0000
:05 +0000 commita848b4b877d2c5933328b37d6a1bb1793281026d (patch) tree6938a817884633dcc54e6b49ff4751da480e5e81 parentb8af68bc93d9a637641e104cb23efc28b0adca4b (diff)downloaddrakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar.gz
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar.bz2
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.tar.xz
drakx-a848b4b877d2c5933328b37d6a1bb1793281026d.zip
fix bogus use of old netwok module instead of network::network (missed when
cleaning up this)
Diffstat
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/network/netconnect.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d898690df..47b519607 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -447,7 +447,7 @@ sub main {
#- done before auto_install is called to allow the -IP feature on auto_install file name
if (-e '/tmp/network') {
- require network;
+ require network::network;
#- get stage1 network configuration if any.
log::l('found /tmp/network');
$o->{netc} ||= {};
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index cdfd75425..9faf60002 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -8,7 +8,7 @@ use run_program;
use modules;
use any;
use mouse;
-use network;
+use network::network;
use network::tools;
use MDK::Common::Globals "network", qw($in $prefix $connect_file $disconnect_file $connect_prog);
@@ -300,7 +300,7 @@ sub load_conf {
my $current = { getVarsFromSh("$prefix/etc/netprofile/current") };
$netcnx->{PROFILE} = $current->{PROFILE} || 'default';
- network::read_all_conf($prefix, $netc, $intf);
+ network::network::read_all_conf($prefix, $netc, $intf);
}
sub get_net_device() {
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-12 11:15:18 +0000