Merge branch '3.1.x'

* 3.1.x: [ticket/10572] Unguarded includes in acp files
updated
author: Tristan Darricau <tristan.darricau@sensiolabs.com> 2015-10-14 10:14:15 +0200
committer: Tristan Darricau <tristan.darricau@sensiolabs.com> 2015-10-14 10:17:04 +0200
commit: e0fb680dbb46f17a48071745c72b0282aa3a1d93 (patch)
tree: 9a05fbcec5a92950fd326c351aa2e47bbab32c6f /phpBB/phpbb/install/controller/helper.php
parent: 1d6e1732597fca176353e674c72b2543c77273f3 (diff)
parent: 657216475468051464b25e12160f1749a71c1cf9 (diff)
download: forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar
forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.gz
forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.bz2
forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.xz
forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.zip
0 files changed, 0 insertions, 0 deletions
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 51d094e46..c9eaaf9ba 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -84,13 +84,14 @@ sub write_resolv_conf {
 	log::l("neither domain name nor dns server are configured");
 	return 0;
     }
-    my @l = cat_($file);
 
-    local *F;
-    open F, "> $file" or die "cannot write $file: $!";
-    print F "search $netc->{DOMAINNAME}\n" if $netc->{DOMAINNAME};
-    print F "nameserver $_\n" foreach dnsServers($netc);
-    print F "#$_" foreach @l;
+    substInFile {
+	s/^([^#].*\n)/\#$1/;
+	if (eof) {
+	    $_ .= "search $netc->{DOMAINNAME}\n" if $netc->{DOMAINNAME};
+	    $_ .= "nameserver $_\n" foreach dnsServers($netc);
+	}
+    } $file;
 
     #-res_init();		# reinit the resolver so DNS changes take affect
     1;
author	Tristan Darricau <tristan.darricau@sensiolabs.com>	2015-10-14 10:14:15 +0200
committer	Tristan Darricau <tristan.darricau@sensiolabs.com>	2015-10-14 10:17:04 +0200
commit	e0fb680dbb46f17a48071745c72b0282aa3a1d93 (patch)
tree	9a05fbcec5a92950fd326c351aa2e47bbab32c6f /phpBB/phpbb/install/controller/helper.php
parent	1d6e1732597fca176353e674c72b2543c77273f3 (diff)
parent	657216475468051464b25e12160f1749a71c1cf9 (diff)
download	forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.gz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.bz2 forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.xz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.zip