From beebb9ee3b2f0766d078ea1335ece1267d290a4f Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Fri, 28 Apr 2017 08:08:52 +0200
Subject: [PATCH] DVL-014 Fix #54 - CP "Tools - Adminer" not working

---
 .devilbox/www/config.php                                     | 2 +-
 .../www/htdocs/vendor/adminer/adminer/include/design.inc.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php
index 1094053f..12d421ed 100644
--- a/.devilbox/www/config.php
+++ b/.devilbox/www/config.php
@@ -47,11 +47,11 @@ $POSTGRES_HOST_ADDR	= gethostbyname($POSTGRES_HOST_NAME);
 //
 function loadClass($class) {
 
-	global $LIB_DIR;
 	global $MYSQL_HOST_ADDR;
 	global $POSTGRES_HOST_ADDR;
 
 	static $_LOADED_LIBS;
+	$LIB_DIR = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR . 'lib';
 
 
 	if (isset($_LOADED_LIBS[$class])) {
diff --git a/.devilbox/www/htdocs/vendor/adminer/adminer/include/design.inc.php b/.devilbox/www/htdocs/vendor/adminer/adminer/include/design.inc.php
index 7c6434d5..e7574974 100755
--- a/.devilbox/www/htdocs/vendor/adminer/adminer/include/design.inc.php
+++ b/.devilbox/www/htdocs/vendor/adminer/adminer/include/design.inc.php
@@ -40,7 +40,10 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 document.body.className = document.body.className.replace(/ nojs/, ' js');
 var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
 </script>
+<?php require '../../../../config.php'; ?>
+<?php error_reporting(6135); ?>
 <?php require '../../../../include/navbar.php'; ?>
+<?php error_reporting(6135); ?>
 <div id="help" class="jush-<?php echo $jush; ?> jsonly hidden" onmouseover="helpOpen = 1;" onmouseout="helpMouseout(this, event);"></div>
 
 <div id="content">
@@ -136,4 +139,4 @@ function page_footer($missing = "") {
 <script type="text/javascript">setupSubmitHighlight(document);</script>
 <?php
 }?>
-<?php require '../../../../include/footer.php'; ?>
\ No newline at end of file
+<?php require '../../../../include/footer.php'; ?>