merge r172 from trunk

git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/branches/1.8@196 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
thexerteproject · Oct 25, 2011 · 9c5794d · 9c5794d
1 parent 2dd293f
commit 9c5794d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/website_code/php/database_library.php b/website_code/php/database_library.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once(dirname(__FILE__) . "/error_library.php");
 /**	
  * 
  * Database library, code for connecting to the database
@@ -22,7 +23,6 @@
 
 function database_connect($success_string, $error_string){
 
-    require_once(dirname(__FILE__) . "/error_library.php");
 
     global $xerte_toolkits_site;
 
@@ -110,7 +110,7 @@ function db_query($sql, $params = array()) {
         }
         $curph--;
     }
-    _debug("Running : $sql");
+    _debug("Running : $sql",1);
     $result = mysql_query($sql, $connection);
     if(!$result) {
         _debug("Failed to execute query : $sql : " . mysql_error());