Merge remote-tracking branch 'origin/master'

phpmyadmin · Jan 25, 2013 · e06c566 · e06c566
2 parents f54b565 + 4f99292
commit e06c566
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
@@ -178,6 +178,7 @@ class Table_Stats
      * Defines properties
      */
 
+    private $_tables;
     private $_tableName;
     private $_showInfo = false;
 
@@ -541,8 +542,8 @@ function __construct()
         $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 @@ function __construct()
      */
     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 @@ private function _drawRelations($changeColor)
      */
     private function _drawTables($changeColor)
     {
-        foreach ($this->tables as $table) {
+        foreach ($this->_tables as $table) {
             $table->tableDraw($changeColor);
         }
     }

diff --git a/tbl_relation.php b/tbl_relation.php
@@ -532,15 +532,14 @@
  * @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) . '&nbsp;&nbsp;'
+    $html_output = htmlspecialchars($dropdown_question) . '&nbsp;&nbsp;'
         . '<select name="' . htmlspecialchars($select_name) . '">' . "\n";
 
     foreach ($choices as $one_value => $one_label) {
@@ -553,17 +552,16 @@ function PMA_generateDropdown(
     $html_output .= '</select>' . "\n";
 
     return $html_output;
-
 }
 
 /**
  * Split a string on backquote pairs
  *
  * @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);
 }
-
 ?>