summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-07-05 14:58:23 -0500
committerChris Buechler <cmb@pfsense.org>2016-07-05 14:58:23 -0500
commit20dc1d7f5a8af202f17858c93ff6e775773d4660 (patch)
tree1f27c712f0bede93d64af4bdad4096a69ea81eff
parentb282aa146b2a1d500ab1340fa2ddae154f96a367 (diff)
parente4eca5a3c7de1de13bf051006a3b52f48eb08c47 (diff)
downloadpfsense-20dc1d7f5a8af202f17858c93ff6e775773d4660.zip
pfsense-20dc1d7f5a8af202f17858c93ff6e775773d4660.tar.gz
Merge pull request #3042 from NewEraCracker/master
-rw-r--r--src/etc/inc/pfsense-utils.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 66fde46..7f7fa9b 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -739,6 +739,9 @@ function get_filename_from_url($url) {
function get_dir($dir) {
$dir_array = array();
$d = dir($dir);
+ if(!is_object($d)) {
+ return array();
+ }
while (false !== ($entry = $d->read())) {
array_push($dir_array, $entry);
}
OpenPOWER on IntegriCloud