diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-18 13:14:05 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-18 13:14:05 +0000 |
| commit | 627d19ce5e73fa783bdf7b19526edd93fe50ed5b (patch) | |
| tree | c5a150ff81ef8cd0bb39fd39dbb23d18d2291f09 | |
| parent | 660530165b5b155774dd419bdd7c9869565109b8 (diff) | |
| download | elgg-627d19ce5e73fa783bdf7b19526edd93fe50ed5b.tar.gz elgg-627d19ce5e73fa783bdf7b19526edd93fe50ed5b.tar.bz2 | |
Closes #790: Removed @ before include statements.
git-svn-id: https://code.elgg.org/elgg/trunk@2797 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/elgglib.php | 4 | ||||
| -rw-r--r-- | engine/start.php | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 81c38e0d5..e7501c0d3 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -335,11 +335,11 @@ $view_location = elgg_get_view_location($view); - if (file_exists($view_location . "{$viewtype}/{$view}.php") && !@include($view_location . "{$viewtype}/{$view}.php")) { + if (file_exists($view_location . "{$viewtype}/{$view}.php") && !include($view_location . "{$viewtype}/{$view}.php")) { $success = false; if ($viewtype != "default") { - if (@include($view_location . "default/{$view}.php")) { + if (include($view_location . "default/{$view}.php")) { $success = true; } } diff --git a/engine/start.php b/engine/start.php index a80cf982f..8abf75f6c 100644 --- a/engine/start.php +++ b/engine/start.php @@ -22,52 +22,52 @@ * Load important prerequisites
*/
- if (!@include_once(dirname(__FILE__) . "/lib/exceptions.php")) { // Exceptions
+ if (!include_once(dirname(__FILE__) . "/lib/exceptions.php")) { // Exceptions
echo "Error in installation: could not load the Exceptions library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/elgglib.php")) { // Main Elgg library
+ if (!include_once(dirname(__FILE__) . "/lib/elgglib.php")) { // Main Elgg library
echo "Elgg could not load its main library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/access.php")) { // Access library
+ if (!include_once(dirname(__FILE__) . "/lib/access.php")) { // Access library
echo "Error in installation: could not load the Access library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/system_log.php")) { // Logging library
+ if (!include_once(dirname(__FILE__) . "/lib/system_log.php")) { // Logging library
echo "Error in installation: could not load the System Log library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/export.php")) { // Export library
+ if (!include_once(dirname(__FILE__) . "/lib/export.php")) { // Export library
echo "Error in installation: could not load the Export library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/sessions.php")) {
+ if (!include_once(dirname(__FILE__) . "/lib/sessions.php")) {
echo ("Error in installation: Elgg could not load the Sessions library");
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/languages.php")) { // Languages library
+ if (!include_once(dirname(__FILE__) . "/lib/languages.php")) { // Languages library
echo "Error in installation: could not load the languages library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/input.php")) { // Input library
+ if (!include_once(dirname(__FILE__) . "/lib/input.php")) { // Input library
echo "Error in installation: could not load the input library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/install.php")) { // Installation library
+ if (!include_once(dirname(__FILE__) . "/lib/install.php")) { // Installation library
echo "Error in installation: could not load the installation library.";
exit;
}
- if (!@include_once(dirname(__FILE__) . "/lib/cache.php")) { // Installation library
+ if (!include_once(dirname(__FILE__) . "/lib/cache.php")) { // Installation library
echo "Error in installation: could not load the cache library.";
exit;
}
@@ -102,14 +102,14 @@ * Load the system settings
*/
- if (!@include_once(dirname(__FILE__) . "/settings.php")) // Global settings
+ if (!include_once(dirname(__FILE__) . "/settings.php")) // Global settings
throw new InstallationException("Elgg could not load the settings file.");
/**
* Load and initialise the database
*/
- if (!@include_once(dirname(__FILE__) . "/lib/database.php")) // Database connection
+ if (!include_once(dirname(__FILE__) . "/lib/database.php")) // Database connection
throw new InstallationException("Elgg could not load the main Elgg database library.");
/**
@@ -117,7 +117,7 @@ * except for a few exceptions
*/
- if (!@include_once(dirname(__FILE__) . "/lib/actions.php")) {
+ if (!include_once(dirname(__FILE__) . "/lib/actions.php")) {
throw new InstallationException("Elgg could not load the Actions library");
}
@@ -145,7 +145,7 @@ // Include them
foreach($files as $file) {
if (isset($CONFIG->debug) && $CONFIG->debug) error_log("Loading $file...");
- if (!@include_once($file))
+ if (!include_once($file))
throw new InstallationException("Could not load {$file}");
}
|