From c097def342181d442616eacfa4aac3acfa195a0b Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Wed, 2 Nov 2005 07:38:57 +0000
Subject: [PATCH] fixed 'not defined function'

---
 ChangeLog               |  4 +++-
 libraries/dbg/setup.php | 12 ++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03fa3e738..76f52f5b9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,9 @@ $Id$
 $Source$
 
 2005-11-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
-    * libraries/dbg/setup.php: display error in error box
+    * libraries/dbg/setup.php:
+      - display error in error box
+      - fixed 'not defined function'
       
 2005-11-01 Marc Delisle  <lem9@users.sourceforge.net>
     * server_privileges.php: undefined variable when changing a password
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
index 9a0f7dfa7..68528e06e 100644
--- a/libraries/dbg/setup.php
+++ b/libraries/dbg/setup.php
@@ -6,18 +6,14 @@ if (isset($GLOBALS['cfg']['DBG']['enable']) && $GLOBALS['cfg']['DBG']['enable'])
     /**
      * Loads the DBG extension if needed
      */
-    if (!@extension_loaded('dbg')) {
-        PMA_dl('dbg');
-    }
-    if (!@extension_loaded('dbg')) {
+    if ( ! @extension_loaded('dbg') && ! PMA_dl('dbg') ) {
         echo '<div class="warning">'
             .sprintf($strCantLoad, 'DBG')
             .' <a href="./Documentation.html#faqdbg" target="documentation">' 
             .$GLOBALS['strDocu'] . '</a>'
             .'</div>';
-        require_once('./footer.inc.php');
+    } else {
+        $GLOBALS['DBG'] = true;
     }
-    $GLOBALS['DBG'] = true;
 }
-
-?>
+?>
\ No newline at end of file