gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use instance variable db rather than the GLOBAL value

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-06-18 15:30:48 +05:30
parent 365d98d4c6
commit 9c994c741d
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
View File

@ -249,7 +249,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
$seen_a_relation = false;
foreach ($alltables as $one_table) {
$exist_rel = PMA_getForeigners($GLOBALS['db'], $one_table, '', 'both');
$exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
if (!$exist_rel) {
continue;
}

4
libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
View File

@ -345,7 +345,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
$this->diagram->setTitle(
sprintf(
__('Schema of the %s database - Page %s'),
$GLOBALS['db'],
$this->db,
$this->pageNumber
)
);
@ -374,7 +374,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
$seen_a_relation = false;
foreach ($alltables as $one_table) {
$exist_rel = PMA_getForeigners($GLOBALS['db'], $one_table, '', 'both');
$exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
if (!$exist_rel) {
continue;
}

18
libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
View File

@ -480,7 +480,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
$this->diagram->SetTitle(
sprintf(
__('Schema of the %s database'),
$GLOBALS['db']
$this->db
)
);
$this->diagram->setCMargin(0);
@ -565,7 +565,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
// and finding its foreigns is OK (then we can support innodb)
$seen_a_relation = false;
foreach ($alltables as $one_table) {
$exist_rel = PMA_getForeigners($GLOBALS['db'], $one_table, '', 'both');
$exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
if (!$exist_rel) {
continue;
}
@ -895,7 +895,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
'L', 0, $this->diagram->PMA_links['doc'][$table]['-']
);
// $this->diagram->Ln(1);
$fields = $GLOBALS['dbi']->getColumns($GLOBALS['db'], $table);
$fields = $GLOBALS['dbi']->getColumns($this->db, $table);
foreach ($fields as $row) {
$this->diagram->SetX(20);
$field_name = $row['Field'];
@ -942,15 +942,15 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
$this->diagram->ln();
$cfgRelation = PMA_getRelationsParam();
$comments = PMA_getComments($GLOBALS['db'], $table);
$comments = PMA_getComments($this->db, $table);
if ($cfgRelation['mimework']) {
$mime_map = PMA_getMIME($GLOBALS['db'], $table, true);
$mime_map = PMA_getMIME($this->db, $table, true);
}
/**
* Gets table information
*/
$showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $table);
$showtable = PMA_Table::sGetStatusInfo($this->db, $table);
$show_comment = isset($showtable['Comment'])
? $showtable['Comment']
: '';
@ -973,12 +973,12 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
/**
* Gets fields properties
*/
$columns = $GLOBALS['dbi']->getColumns($GLOBALS['db'], $table);
$columns = $GLOBALS['dbi']->getColumns($this->db, $table);
// Check if we can use Relations
if (!empty($cfgRelation['relation'])) {
// Find which tables are related with the current one and write it in
// an array
$res_rel = PMA_getForeigners($GLOBALS['db'], $table);
$res_rel = PMA_getForeigners($this->db, $table);
} // end if
/**
@ -1080,7 +1080,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
$linksTo = '';
if ($foreigner) {
$linksTo = '-> ';
if ($foreigner['foreign_db'] != $GLOBALS['db']) {
if ($foreigner['foreign_db'] != $this->db) {
$linksTo .= $foreigner['foreign_db'] . '.';
}
$linksTo .= $foreigner['foreign_table']

4
libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
View File

@ -318,7 +318,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
$this->diagram->setTitle(
sprintf(
__('Schema of the %s database - Page %s'),
$GLOBALS['db'],
$this->db,
$this->pageNumber
)
);
@ -347,7 +347,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
}
$seen_a_relation = false;
foreach ($alltables as $one_table) {
$exist_rel = PMA_getForeigners($GLOBALS['db'], $one_table, '', 'both');
$exist_rel = PMA_getForeigners($this->db, $one_table, '', 'both');
if (!$exist_rel) {
continue;
}