From d203a2e6f4bb69b9b33e157c130eab6408ebce89 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 17 Jun 2008 16:28:52 +0000 Subject: Fixed #37. It turns out callpath_gatekeeper worked fine; PHP 5.2 with the Zend Optimizer 3.2 does not, which was borking our OSX MAMP installation. We're going to need a great big red warning box for people installing on a Mac, alerting them to the fact that they'll need to switch off the Optimizer. git-svn-id: https://code.elgg.org/elgg/trunk@950 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/database.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engine/lib') diff --git a/engine/lib/database.php b/engine/lib/database.php index 73ef2236c..d3113e202 100644 --- a/engine/lib/database.php +++ b/engine/lib/database.php @@ -129,8 +129,8 @@ global $CONFIG, $dbcalls; - //if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) - // throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'get_data()')); + if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) + throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'get_data()')); $dblink = get_db_link('read'); @@ -174,8 +174,8 @@ global $CONFIG, $dbcalls; - //if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) - // throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'get_data_row()')); + if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) + throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'get_data_row()')); $dblink = get_db_link('read'); @@ -213,8 +213,8 @@ global $CONFIG, $dbcalls; - //if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) - // throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'insert_data()')); + if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) + throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'insert_data()')); $dblink = get_db_link('write'); @@ -245,8 +245,8 @@ global $dbcalls, $CONFIG; - //if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) - // throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'update_data()')); + if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) + throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'update_data()')); $dblink = get_db_link('write'); @@ -278,8 +278,8 @@ global $dbcalls, $CONFIG; - //if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) - // throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'delete_data()')); + if (!callpath_gatekeeper($CONFIG->path . "engine/", true, true)) + throw new SecurityException(sprintf(elgg_echo('SecurityException:FunctionDenied'), 'delete_data()')); $dblink = get_db_link('write'); -- cgit v1.2.3