From 5316e57a09d90528cd06f9023ea51999c6e5d679 Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Mon, 8 Feb 2010 10:38:05 -0500 Subject: [PATCH] MInor - Removed global.inc.php is not neccesary for this file CT#191 --- main/dropbox/dropbox_functions.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php index 2cca7962f6..a862b3f111 100755 --- a/main/dropbox/dropbox_functions.inc.php +++ b/main/dropbox/dropbox_functions.inc.php @@ -5,7 +5,7 @@ * functions in the init files also but I have moved them over * to one file -- Patrick Cool , Ghent University */ -require_once '../inc/global.inc.php'; +//require_once '../inc/global.inc.php'; /* ----------------------------------------------------------- Javascript @@ -706,6 +706,8 @@ function display_add_form() */ function getUserNameFromId ( $id) // RH: Mailing: return 'Mailing ' + id { + global $dropbox_cnf; + $mailingId = $id - dropbox_cnf("mailingIdBase"); if ( $mailingId > 0) { @@ -713,7 +715,7 @@ function getUserNameFromId ( $id) // RH: Mailing: return 'Mailing ' + id } $id = intval($id); $sql = "SELECT ".(api_is_western_name_order() ? "CONCAT(firstname,' ', lastname)" : "CONCAT(lastname,' ', firstname)")." AS name - FROM " . dropbox_cnf("tbl_user") . " + FROM " . $dropbox_cnf["tbl_user"] . " WHERE user_id='$id'"; $result = Database::query($sql,__FILE__,__LINE__); $res = Database::fetch_array( $result);