Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Mendel <cybot_tm@users.sourceforge.net>2005-12-17 20:36:58 +0300
committerSebastian Mendel <cybot_tm@users.sourceforge.net>2005-12-17 20:36:58 +0300
commit16a71a194ea0f0d294d8687da9e7844d7e56ca6d (patch)
treee477be891fc239f66545dc68283da3732380f2d8 /pdf_schema.php
parentd1b9d33269f4ea03204349efce52f1c7775284e6 (diff)
added database name to relation querys
Diffstat (limited to 'pdf_schema.php')
-rw-r--r--pdf_schema.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/pdf_schema.php b/pdf_schema.php
index 9f106b7fd4..6064a30251 100644
--- a/pdf_schema.php
+++ b/pdf_schema.php
@@ -316,7 +316,7 @@ class PMA_PDF extends PMA_FPDF
global $cfgRelation,$db,$pdf_page_number,$with_doc;
if ($with_doc){
- $test_query = 'SELECT * FROM ' . PMA_backquote($cfgRelation['pdf_pages'])
+ $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND page_nr = \'' . $pdf_page_number . '\'';
$test_rs = PMA_query_as_cu($test_query);
@@ -709,7 +709,7 @@ class PMA_RT_Table
//x and y
$sql = 'SELECT x, y FROM '
- . PMA_backquote($cfgRelation['table_coords'])
+ . PMA_backquote($GLOBALS['cfgRelation']['db']) . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND table_name = \'' . PMA_sqlAddslashes($table_name) . '\''
. ' AND pdf_page_number = ' . $pdf_page_number;
@@ -1046,7 +1046,7 @@ class PMA_RT
$pdf->SetLineWidth(0.2);
$pdf->SetDisplayMode('fullpage');
// Get the name of this pdfpage to use as filename (Mike Beck)
- $_name_sql = 'SELECT page_descr FROM ' . PMA_backquote($cfgRelation['pdf_pages'])
+ $_name_sql = 'SELECT page_descr FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' WHERE page_nr = ' . $pdf_page_number;
$_name_rs = PMA_query_as_cu($_name_sql);
if ($_name_rs) {
@@ -1116,7 +1116,7 @@ class PMA_RT
$pdf->SetAutoPageBreak('auto');
// Gets tables on this page
- $tab_sql = 'SELECT table_name FROM ' . PMA_backquote($cfgRelation['table_coords'])
+ $tab_sql = 'SELECT table_name FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords'])
. ' WHERE db_name = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND pdf_page_number = ' . $which_rel;
$tab_rs = PMA_query_as_cu($tab_sql, NULL, PMA_DBI_QUERY_STORE);
@@ -1176,7 +1176,7 @@ class PMA_RT
$pdf->PMA_PDF_setFontSizeScale(14);
-// $sql = 'SELECT * FROM ' . PMA_backquote($cfgRelation['relation'])
+// $sql = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
// . ' WHERE master_db = \'' . PMA_sqlAddslashes($db) . '\' '
// . ' AND foreign_db = \'' . PMA_sqlAddslashes($db) . '\' '
// . ' AND master_table IN (' . $intable . ')'