diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
| commit | 693a2dc99bf07aeac1865d4a48ddf2589317ac7a (patch) | |
| tree | 8bd926d3671dc9de0a72d4025aaa625a18ba51e1 /phpBB/includes/functions_compress.php | |
| parent | b68de2323d6444b4b3685a98bbcb9500a38e45cb (diff) | |
| parent | ac329275662f737f03f485107cb69412739c1afa (diff) | |
| download | forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.gz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.bz2 forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.xz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.zip | |
Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
Diffstat (limited to 'phpBB/includes/functions_compress.php')
| -rw-r--r-- | phpBB/includes/functions_compress.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php index 590daabf1d..f17c780a65 100644 --- a/phpBB/includes/functions_compress.php +++ b/phpBB/includes/functions_compress.php @@ -80,6 +80,11 @@ class compress } } } + else + { + // $src does not exist + return false; + } return true; } @@ -89,6 +94,11 @@ class compress */ function add_custom_file($src, $filename) { + if (!file_exists($src)) + { + return false; + } + $this->data($filename, file_get_contents($src), false, stat($src)); return true; } |