The branch, master has been updated via eef315c6354950687004007f66e8982c90836c4d (commit) via bf4b95dafe3f6bc2489872739a13eac2f8c857e1 (commit) via f06e8ee9fca47c049b74b1224e20b12a26fa5934 (commit) via 329c9cac680114accbffbceff2e688924e1edb1f (commit) via 55f2d0726bbe0f8846d1cb397972c372d3ea955e (commit) from 43f22790cb27e7a878c090161500083cdc1ae7ec (commit)
- Log ----------------------------------------------------------------- commit eef315c6354950687004007f66e8982c90836c4d Merge: bf4b95d 43f2279 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Oct 8 17:27:26 2011 +0530
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit bf4b95dafe3f6bc2489872739a13eac2f8c857e1 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Oct 8 14:33:39 2011 +0530
Little bit more width for tables
commit f06e8ee9fca47c049b74b1224e20b12a26fa5934 Merge: 00fcdb2 329c9ca Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Oct 8 14:26:48 2011 +0530
Merge branch 'QA_3_4'
Conflicts: libraries/schema/Pdf_Relation_Schema.class.php libraries/schema/User_Schema.class.php
-----------------------------------------------------------------------
Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 2 +- libraries/schema/User_Schema.class.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ff1a000..a0c1171 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -489,7 +489,7 @@ class Table_Stats foreach ($this->fields as $field) { $this->width = max($this->width, $pdf->GetStringWidth($field)); } - $this->width += $pdf->GetStringWidth(' '); + $this->width += $pdf->GetStringWidth(' '); $pdf->SetFont($this->_ff, 'B', $fontSize); /* * it is unknown what value must be added, because diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 9de8327..a155995 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -87,7 +87,7 @@ class PMA_User_Schema $_POST['delrow'], $cfgRelation, $db, - $_POST['chpage'] + $_POST['chpage'] ); break; case 'process_export': @@ -232,11 +232,12 @@ class PMA_User_Schema $selectboxall[] = $val[0]; }
+ $tabExist = array(); + /* * Now if we already have chosen a page number then we should * show the tables involved */ - if (isset($this->chosenPage) && $this->chosenPage > 0) { echo "\n"; ?>
hooks/post-receive