aboutsummaryrefslogtreecommitdiff
path: root/lib/Minz/Configuration.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-07-29 08:48:12 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-07-29 08:48:12 +0200
commitde964592501a9742585966d1ddcb4b7df894efe6 (patch)
treed3e906bc9c6c0fbd717cd750cafa0fd84ec2df6c /lib/Minz/Configuration.php
parente126b0add7c00dc0ba56db35264d0138183c3604 (diff)
parent650b5e27218cc1f3c723cd6c04078d8f90d14ec0 (diff)
Merge branch 'marienfressinaud-920-white-page-bad-config' into dev
Diffstat (limited to 'lib/Minz/Configuration.php')
-rw-r--r--lib/Minz/Configuration.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 1db8e2daf..d695d4a53 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -39,7 +39,7 @@ class Minz_Configuration {
throw new Minz_FileNotExistException($filename);
}
- $data = @include($filename);
+ $data = include($filename);
if (is_array($data)) {
return $data;
} else {