8 Oct
2011
8 Oct
'11
2:40 p.m.
The branch, QA_3_4 has been updated
via 329c9cac680114accbffbceff2e688924e1edb1f (commit)
via 55f2d0726bbe0f8846d1cb397972c372d3ea955e (commit)
from 338709a264b80a910e639cca9cc3de310242b93d (commit)
- Log -----------------------------------------------------------------
commit 329c9cac680114accbffbceff2e688924e1edb1f
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Sat Oct 8 14:15:17 2011 +0530
Avoid warnings on undefined variables
commit 55f2d0726bbe0f8846d1cb397972c372d3ea955e
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Sat Oct 8 14:14:13 2011 +0530
Typo
-----------------------------------------------------------------------
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 ad0fe7a..a5aa182 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -1075,7 +1075,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
if (empty($filename)) {
$filename = $pageNumber . '.pdf';
}
- $fileName = PMA_sanitize_filename($fileName);
+ $filename = PMA_sanitize_filename($filename);
// instead of $pdf->Output():
$pdfData = $pdf->getPDFData();
diff --git a/libraries/schema/User_Schema.class.php
b/libraries/schema/User_Schema.class.php
index 310ffec..7b9960a 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -200,11 +200,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";
?>
@@ -496,7 +497,7 @@ class PMA_User_Schema
// the table has been dropped from outside phpMyAdmin
if (PMA_DBI_getError()) {
continue;
- }
+ }
echo '<div id="table_' . $i . '"
class="pdflayout_table"><u>' . $temp_sh_page['table_name']
. '</u>';
if (isset($with_field_names)) {
while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
hooks/post-receive
--
phpMyAdmin