From: bradymiller Date: Thu, 18 Apr 2013 04:19:30 +0000 (-0700) Subject: Fourth merge from Julia Longtin repository with conflict fix in interface/patient_fil... X-Git-Tag: whats-been-changed~343 X-Git-Url: https://repo.or.cz/w/openemr.git/commitdiff_plain/347f43d0dd3632215911f8b89ec32f9647e18800 Fourth merge from Julia Longtin repository with conflict fix in interface/patient_file/deleter.php --- 347f43d0dd3632215911f8b89ec32f9647e18800 diff --cc interface/patient_file/deleter.php index 02f00fc7b,e962e16d0..5b79b4c44 --- a/interface/patient_file/deleter.php +++ b/interface/patient_file/deleter.php @@@ -1,15 -1,25 +1,25 @@@ - // - // This program is free software; you can redistribute it and/or - // modify it under the terms of the GNU General Public License - // as published by the Free Software Foundation; either version 2 - // of the License, or (at your option) any later version. + /** + * delete tool, for logging and removing patient data. + * + * Called from many different pages. + * - * Copyright (C) 2005-2011 Rod Roark ++ * Copyright (C) 2005-2013 Rod Roark + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * @package OpenEMR + * @author Rod Roark + * @link http://www.open-emr.org + */ - require_once("../globals.php"); - require_once("$srcdir/log.inc"); - require_once("$srcdir/acl.inc"); - require_once("$srcdir/sl_eob.inc.php"); + require_once('../globals.php'); + require_once($GLOBALS['srcdir'].'/log.inc'); + require_once($GLOBALS['srcdir'].'/acl.inc'); + require_once($GLOBALS['srcdir'].'/sl_eob.inc.php'); $patient = $_REQUEST['patient']; $encounterid = $_REQUEST['encounterid'];