diff --git a/lib.inc.php3 b/lib.inc.php3
index 1f163e7c7..c42c3f628 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -487,7 +487,8 @@ function get_table_def($db, $table, $crlf)
 // modified by Lem9 to allow older MySQL versions to continue to work
 
     if(MYSQL_MAJOR_VERSION == "3.23" && intval(MYSQL_MINOR_VERSION) > 20){
-                $result=mysql_query("show create table " .db_name($db).".$table");
+                $result=mysql_query("show create table " .db_name($db)."."
+			. tbl_name($table));
                 if ($result!=false && mysql_num_rows($result)>0){
                         $tmpres=mysql_fetch_array($result);
                         $tmp=$tmpres[1];
@@ -498,7 +499,8 @@ function get_table_def($db, $table, $crlf)
 
     $schema_create .= "CREATE TABLE $table ($crlf";
 
-    $result = mysql_query("SHOW FIELDS FROM " .db_name($db).".$table") or mysql_die();
+    $result = mysql_query("SHOW FIELDS FROM " .db_name($db)."." 
+	. tbl_name($table)) or mysql_die();
     while($row = mysql_fetch_array($result))
     {
         $schema_create .= "   $row[Field] $row[Type]";
@@ -512,7 +514,8 @@ function get_table_def($db, $table, $crlf)
         $schema_create .= ",$crlf";
     }
     $schema_create = ereg_replace(",".$crlf."$", "", $schema_create);
-    $result = mysql_query("SHOW KEYS FROM " .db_name($db).".$table") or mysql_die();
+    $result = mysql_query("SHOW KEYS FROM " .db_name($db)."." .
+	tbl_name($table)) or mysql_die();
     while($row = mysql_fetch_array($result))
     {
         $kname=$row['Key_name'];
@@ -568,7 +571,8 @@ function get_table_content ($db, $table, $handler){
 
 // only php >= 4.0.5 - staybyte - 27. June 2001
 function get_table_content_fast($db, $table, $handler){
-	$result = mysql_query("SELECT * FROM ".db_name($db).".$table") or mysql_die();
+	$result = mysql_query("SELECT * FROM ".db_name($db)."." .
+		tbl_name($table)) or mysql_die();
 	if ($result!=false){
 		for($j=0; $j<mysql_num_fields($result);$j++){
 			$field_set[$j]= mysql_field_name($result,$j);
@@ -612,7 +616,8 @@ function get_table_content_fast($db, $table, $handler){
 
 function get_table_content_old($db, $table, $handler)
 {
-    $result = mysql_query("SELECT * FROM " . db_name($db) .".$table") or mysql_die();
+    $result = mysql_query("SELECT * FROM " . db_name($db) ."." .
+		tbl_name($table)) or mysql_die();
     $i = 0;
     while($row = mysql_fetch_row($result))
     {
@@ -668,7 +673,8 @@ function get_table_content_old($db, $table, $handler)
 
 function count_records ($db,$table)
 {
-    $result = mysql_query("select count(*) as num from ".db_name($db).".$table");
+    $result = mysql_query("select count(*) as num from ".db_name($db)."." .
+	tbl_name($table));
     $num = mysql_result($result,0,"num");
     echo $num;
 }
@@ -679,7 +685,8 @@ function count_records ($db,$table)
 // $handler must accept one parameter ($sql_insert);
 function get_table_csv($db, $table, $sep, $handler)
 {
-    $result = mysql_query("SELECT * FROM ".db_name($db).".$table") or mysql_die();
+    $result = mysql_query("SELECT * FROM ".db_name($db)."." .
+	tbl_name($table)) or mysql_die();
     $i = 0;
     while($row = mysql_fetch_row($result))
     {