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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-01-25 17:14:28 +01:00
commit e06c566911
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/schema/Visio_Relation_Schema.class.php
View File

@ -178,6 +178,7 @@ class Table_Stats
* Defines properties
*/
private $_tables;
private $_tableName;
private $_showInfo = false;
@ -541,8 +542,8 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
$alltables = $this->getAllTables($db, $this->pageNumber);
foreach ($alltables as $table) {
if (! isset($this->tables[$table])) {
$this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys);
if (! isset($this->_tables[$table])) {
$this->_tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys);
}
}
@ -594,19 +595,19 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys)
{
if (! isset($this->tables[$masterTable])) {
$this->tables[$masterTable] = new Table_Stats(
if (! isset($this->_tables[$masterTable])) {
$this->_tables[$masterTable] = new Table_Stats(
$masterTable, $this->pageNumber, $showKeys
);
}
if (! isset($this->tables[$foreignTable])) {
$this->tables[$foreignTable] = new Table_Stats(
if (! isset($this->_tables[$foreignTable])) {
$this->_tables[$foreignTable] = new Table_Stats(
$foreignTable, $this->pageNumber, $showKeys
);
}
$this->_relations[] = new Relation_Stats(
$this->tables[$masterTable], $masterField,
$this->tables[$foreignTable], $foreignField
$this->_tables[$masterTable], $masterField,
$this->_tables[$foreignTable], $foreignField
);
}
@ -638,7 +639,7 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _drawTables($changeColor)
{
foreach ($this->tables as $table) {
foreach ($this->_tables as $table) {
$table->tableDraw($changeColor);
}
}

13
tbl_relation.php
View File

@ -532,15 +532,14 @@ PMA_Response::getInstance()->addHTML($html_output);
* @param array $choices Choices for dropdown
* @param string $selected_value Selected value
*
* @return string $html_output The html code for existing value (for selected)
* @return string The html code for existing value (for selected)
*
* @access public
* @access public
*/
function PMA_generateDropdown(
$dropdown_question, $select_name, $choices, $selected_value
) {
$html_output .= htmlspecialchars($dropdown_question) . '  '
$html_output = htmlspecialchars($dropdown_question) . '  '
. '<select name="' . htmlspecialchars($select_name) . '">' . "\n";
foreach ($choices as $one_value => $one_label) {
@ -553,7 +552,6 @@ function PMA_generateDropdown(
$html_output .= '</select>' . "\n";
return $html_output;
}
/**
@ -561,9 +559,9 @@ function PMA_generateDropdown(
*
* @param string $text original string
*
* @return array containing the elements (and their surrounding backquotes)
* @return array containing the elements (and their surrounding backquotes)
*
* @access public
* @access public
*/
function PMA_backquoteSplit($text)
{
@ -588,5 +586,4 @@ function PMA_backquoteSplit($text)
}
return($elements);
}
?>