From 314ffb33a1123a18248df50cb7145a2333790950 Mon Sep 17 00:00:00 2001
From: Umer Muhammad <umer.practiceproviders@nxvt.com>
Date: Wed, 27 Jan 2016 12:53:06 +0500
Subject: [PATCH] PHP7 Project. Commit 10. Set phpgacl and postnuke to use the
 centralized adodb libary.

---
 gacl/gacl.class.php                        | 2 +-
 interface/main/calendar/includes/pnAPI.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gacl/gacl.class.php b/gacl/gacl.class.php
index 1cf65089e..72a5f6b69 100644
--- a/gacl/gacl.class.php
+++ b/gacl/gacl.class.php
@@ -36,7 +36,7 @@
  */
 
 if ( !defined('ADODB_DIR') ) {
-	define('ADODB_DIR', dirname(__FILE__).'/adodb');
+	define('ADODB_DIR', dirname(__FILE__).'/../library/adodb');
 }
 
 //openemr configuration file - bm - 05-2009
diff --git a/interface/main/calendar/includes/pnAPI.php b/interface/main/calendar/includes/pnAPI.php
index 4eedbb209..1df4285a5 100644
--- a/interface/main/calendar/includes/pnAPI.php
+++ b/interface/main/calendar/includes/pnAPI.php
@@ -345,8 +345,11 @@ function pnInit()
     }
 
     // ADODB configuration
-    define('ADODB_DIR', 'pnadodb');
-    require 'pnadodb/adodb.inc.php';
+    if (!defined('ADODB_DIR')) {
+        define('ADODB_DIR', dirname(__FILE__) . '/../../../../library/adodb');
+    }
+
+    require ADODB_DIR . '/adodb.inc.php';
 
     // Temporary fix for hacking the hlpfile global
     // TODO - remove with pre-0.71 code
-- 
2.11.4.GIT