Catching error on datalists

git-svn-id: https://code.elgg.org/elgg/trunk@2252 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 8 insertions, 4 deletions

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index e7bdbe665..5d31354eb 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1478,10 +1478,14 @@
 			$name = sanitise_string($name);
 			if (isset($DATALIST_CACHE[$name]))
 				return $DATALIST_CACHE[$name];
-			

-			if ($row = get_data_row("select value from {$CONFIG->dbprefix}datalists where name = '{$name}'")) {
-				$DATALIST_CACHE[$name] = $row->value;

-				return $row->value;

+			
+			try {

+				if ($row = get_data_row("select value from {$CONFIG->dbprefix}datalists where name = '{$name}'")) {
+					$DATALIST_CACHE[$name] = $row->value;

+					return $row->value;

+				}
+			} catch (DatabaseException $e) {
+				return false; // Likely can't handle the exception so just return false.
 			}

 			return false;