Fixes #4382 catches lost connection to database - from Paweł

diff --git a/engine/lib/database.php b/engine/lib/database.php
index cc2b99f6ac43c9c088555e26306f684ba4e3cdac..7d90b30b87c2a279abcb75ee9ea07143a0089f70 100644 (file)
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -253,6 +253,10 @@ function execute_query($query, $dblink) {
                throw new DatabaseException(elgg_echo('DatabaseException:InvalidQuery'));
        }
 
+       if (!is_resource($dblink)) {
+               throw new DatabaseException(elgg_echo('DatabaseException:InvalidDBLink'));
+       }
+
        $dbcalls++;
 
        $result = mysql_query($query, $dblink);

diff --git a/languages/en.php b/languages/en.php
index e9c333041bfd65a2dded76247cacaace4f1ada7c..93096df3855aeb62bd7b1008ff6c1a631f2c428d 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -56,6 +56,7 @@ $english = array(
        'DatabaseException:DBSetupIssues' => "There were a number of issues: ",
        'DatabaseException:ScriptNotFound' => "Elgg couldn't find the requested database script at %s.",
        'DatabaseException:InvalidQuery' => "Invalid query",
+       'DatabaseException:InvalidDBLink' => "Connection to database was lost.",
 
        'IOException:FailedToLoadGUID' => "Failed to load new %s from GUID:%d",
        'InvalidParameterException:NonElggObject' => "Passing a non-ElggObject to an ElggObject constructor!",