aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/configuration.php3
-rw-r--r--engine/lib/elgglib.php4
2 files changed, 6 insertions, 1 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index d60b7b8f3..dfbc95279 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -44,6 +44,9 @@
if (empty($CONFIG->sitename))
$CONFIG->sitename = "New Elgg site";
+
+ if (empty($CONFIG->debug))
+ $CONFIG->debug = false;
}
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index d98b0fabf..78eb17daf 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -112,7 +112,7 @@
} else {
$location = $CONFIG->views->locations[$view];
}
- if (!@include($location . "{$viewtype}/{$view}.php")) {
+ if (file_exists($location . "{$viewtype}/{$view}.php") && !@include($location . "{$viewtype}/{$view}.php")) {
$success = false;
if ($viewtype != "default") {
if (@include($location . "default/{$view}.php")) {
@@ -122,6 +122,8 @@
if (!$success && isset($CONFIG->debug) && $CONFIG->debug == true) {
echo " [This view ({$view}) does not exist] ";
}
+ } else if ($CONFIG->debug == true) {
+ echo " [This view ({$view}) does not exist] ";
}
}