aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-19 15:36:06 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-19 15:36:06 +0000
commit53239e5a4f96b62a56d2912d6e1e0e60bcf6d3e7 (patch)
treed909fb63dc40380d55b0761c3026e6c6a49932a1 /engine/lib
parent1f851e08ba9274fa524db6f75b2c2cc21ec4dcf2 (diff)
downloadelgg-53239e5a4f96b62a56d2912d6e1e0e60bcf6d3e7.tar.gz
elgg-53239e5a4f96b62a56d2912d6e1e0e60bcf6d3e7.tar.bz2
Refs #266: Error given if no database has been set up.
git-svn-id: https://code.elgg.org/elgg/trunk@2017 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/database.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/engine/lib/database.php b/engine/lib/database.php
index 86044a375..abd3e52a4 100644
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -344,8 +344,14 @@
if (isset($tables)) {
return $tables;
}
-
- $result = get_data("show tables");
+
+ try{
+ $result = get_data("show tables");
+ } catch (DatabaseException $d)
+ {
+ // Likely we can't handle an exception here, so just return false.
+ return false;
+ }
$tables = array();