From 5884aa01d1264004ed16423833eac7928ef235fe Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 13 Oct 2008 18:26:55 +0000
Subject: Catching error on datalists

git-svn-id: https://code.elgg.org/elgg/trunk@2252 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/elgglib.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'engine/lib/elgglib.php')

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;
 			
-- 
cgit v1.2.3