diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-02-04 17:01:20 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-02-04 17:02:24 -0200 |
| commit | 4bdb08e3b0d4dacaba45f60e7f8a192f1f6d670e (patch) | |
| tree | bdf6da985528d3b0dd663995be6a07018ec7c678 /etc | |
| parent | 4b9011f5c54f88f86619548afa190ed368a77f9f (diff) | |
| download | pfsense-4bdb08e3b0d4dacaba45f60e7f8a192f1f6d670e.zip pfsense-4bdb08e3b0d4dacaba45f60e7f8a192f1f6d670e.tar.gz | |
Use unlink_if_exists or @unlink to avoid PHP errors when file doesn't exist
Conflicts:
usr/local/www/firewall_aliases_edit.php
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
| -rw-r--r-- | etc/inc/rrd.inc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e842ffa..49c6121 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1823,7 +1823,7 @@ EOD; } else { if (file_exists("/conf/{$pppif}.log")) { conf_mount_rw(); - unlink("/conf/{$pppif}.log"); + @unlink("/conf/{$pppif}.log"); conf_mount_ro(); } } diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index a66120a..16d7aaa 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -36,8 +36,7 @@ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) { $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; - if(file_exists($xmldumpfile)) - unlink($xmldumpfile); + unlink_if_exists($xmldumpfile); exec("$rrdtool dump " . escapeshellarg($rrddatabase) . " {$xmldumpfile} 2>&1", $dumpout, $dumpret); if ($dumpret <> 0) { |
