Git March 2010

git@phpmyadmin.net

4 participants
212 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1155-g31a023f

by Michal Čihař

The branch, master has been updated via 31a023f96090c16bc791ee3bf2decb4d23c45388 (commit) via f8c1c2712bf62d34370262a80961696244f8ba30 (commit) via 90fa85076c5a51fb09744ca0121f113358bdddf4 (commit) via 15a712575e582b8b1b5ee0609f2208896cf6bf91 (commit) via 4fc2a6d3d1747797206fb9facf96e20787525b58 (commit) via bd97ce16f299da87b963984e53ea0f87086afaab (commit) via e834697183c89ea9b6facab06b249c4fc7752dfb (commit) from 43afb034ee33c20d12b0ada65b11e2dc43b51a02 (commit) - Log ----------------------------------------------------------------- commit 31a023f96090c16bc791ee3bf2decb4d23c45388 Merge: f8c1c2712bf62d34370262a80961696244f8ba30 43afb034ee33c20d12b0ada65b11e2dc43b51a02 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 31 16:40:22 2010 +0200 Merge remote branch 'origin/master' commit f8c1c2712bf62d34370262a80961696244f8ba30 Merge: 90fa85076c5a51fb09744ca0121f113358bdddf4 251403e61741b961bc73a4edbe11b2e055dd19ef Author: Michal Čihař <michal(a)cihar.com> Date: Wed Mar 31 14:41:07 2010 +0200 Merge remote branch 'origin/master' commit 90fa85076c5a51fb09744ca0121f113358bdddf4 Author: marc <marc(a)infomarc.info> Date: Wed Mar 31 14:04:42 2010 +0200 Translation update done using Pootle. commit 15a712575e582b8b1b5ee0609f2208896cf6bf91 Author: marc <marc(a)infomarc.info> Date: Wed Mar 31 14:04:26 2010 +0200 Translation update done using Pootle. commit 4fc2a6d3d1747797206fb9facf96e20787525b58 Author: marc <marc(a)infomarc.info> Date: Wed Mar 31 14:03:28 2010 +0200 Translation update done using Pootle. commit bd97ce16f299da87b963984e53ea0f87086afaab Author: marc <marc(a)infomarc.info> Date: Wed Mar 31 14:02:56 2010 +0200 Translation update done using Pootle. commit e834697183c89ea9b6facab06b249c4fc7752dfb Author: marc <marc(a)infomarc.info> Date: Wed Mar 31 13:50:47 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/po/fr.po b/po/fr.po index d92bed9..4d57b28 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-30 23:18+0200\n" -"PO-Revision-Date: 2010-03-30 18:30+0200\n" +"PO-Revision-Date: 2010-03-31 14:04+0200\n" "Last-Translator: <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -62,12 +62,12 @@ msgstr[0] "%1$d enregistrement supprimé." msgstr[1] "%1$d enregistrements supprimés." #: libraries/Message.class.php:320 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) inserted." msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "%1$d enregistrement(s) inséré(s)." -msgstr[1] "%1$d enregistrement(s) inséré(s)." +msgstr[0] "%1$d enregistrement inséré." +msgstr[1] "%1$d enregistrements insérés." #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:15 @@ -6147,9 +6147,8 @@ msgid "Row marker" msgstr "Activer le marqueur d'enregistrements" #: setup/lib/messages.inc.php:23 -#, fuzzy msgid "Highlight row pointed by the mouse cursor" -msgstr "...dans le panneau de navigation" +msgstr "Mettre en surbrillance l'enregistrement sur lequel pointe la souris" #: setup/lib/messages.inc.php:24 msgid "Highlight pointer" @@ -6276,7 +6275,7 @@ msgstr "Serveur par défaut" #: setup/lib/messages.inc.php:47 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "L'onglet affiché lors de l'entrée dans une base de données" #: setup/lib/messages.inc.php:48 msgid "Default database tab" @@ -6284,7 +6283,7 @@ msgstr "Onglet par défaut pour bases de données" #: setup/lib/messages.inc.php:49 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "L'onglet initial dans l'affichage serveur" #: setup/lib/messages.inc.php:50 msgid "Default server tab" @@ -6292,7 +6291,7 @@ msgstr "Onglet par défaut pour serveur" #: setup/lib/messages.inc.php:51 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "L'onglet initial lors de l'accès à une table" #: setup/lib/messages.inc.php:52 msgid "Default table tab" hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1148-g43afb03

by Michal Čihař

The branch, master has been updated via 43afb034ee33c20d12b0ada65b11e2dc43b51a02 (commit) via 58c33c410e2699484d6183b3fb0318d108cebd8d (commit) from 251403e61741b961bc73a4edbe11b2e055dd19ef (commit) - Log ----------------------------------------------------------------- commit 43afb034ee33c20d12b0ada65b11e2dc43b51a02 Merge: 251403e61741b961bc73a4edbe11b2e055dd19ef 58c33c410e2699484d6183b3fb0318d108cebd8d Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 31 14:43:10 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: navigation.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/navigation.php b/navigation.php index cb031ed..8fcc7ab 100644 --- a/navigation.php +++ b/navigation.php @@ -314,7 +314,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { } echo '</a></p>'; if ($table_count) { - echo '<span id=\'NavFilter\' style="display:none;"><span onclick="document.getElementById(\'fast_filter\').value=\'\'; fast_filter(\'\');document.getElementById(\'fast_filter\').focus();" style="background:white;color:black;cursor:pointer;padding:2px;margin:0 0 0 -20px;position:relative;float:right;" title="' . $strReset . '">X</span><input type="text" name="fast_filter" id="fast_filter" title="' . $strNavTableFilter . '" onkeyup="setTimeout(function(word){ return function(){ fast_filter(word);}}(this.value),1000);" style="width:100%;padding:0 -20px 0 0; padding:2px;" onfocus="this.select();" /></span><script type="text/javascript">document.getElementById(\'NavFilter\').style.display=\'\';</script>'; + echo '<span id=\'NavFilter\' style="display:none;"><span onclick="document.getElementById(\'fast_filter\').value=\'\'; fast_filter(\'\');document.getElementById(\'fast_filter\').focus();" style="background:white;color:black;cursor:pointer;padding:2px;margin:0 0 0 -20px;position:relative;float:right;" title="' . $strReset . '">X</span><input type="text" name="fast_filter" id="fast_filter" title="' . $strNavTableFilter . '" onkeyup="setTimeout(function(word){ return function(){ fast_filter(word);}}(this.value),1000);" style="width:90%;padding:0 -20px 0 0; padding:2px;" onfocus="this.select();" /></span><script type="text/javascript">document.getElementById(\'NavFilter\').style.display=\'\';</script>'; } /** hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-85-g58c33c4

by Michal Čihař

The branch, QA_3_3 has been updated via 58c33c410e2699484d6183b3fb0318d108cebd8d (commit) from eb5e03880e579d572ec8e45a8fc0777929defddc (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: navigation.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/navigation.php b/navigation.php index 8bb5361..fb5e52c 100644 --- a/navigation.php +++ b/navigation.php @@ -298,7 +298,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { } echo '</a></p>'; if ($table_count) { - echo '<span id=\'NavFilter\' style="display:none;"><span onclick="document.getElementById(\'fast_filter\').value=\'\'; fast_filter(\'\');document.getElementById(\'fast_filter\').focus();" style="background:white;color:black;cursor:pointer;padding:2px;margin:0 0 0 -20px;position:relative;float:right;" title="' . $strReset . '">X</span><input type="text" name="fast_filter" id="fast_filter" title="' . $strNavTableFilter . '" onkeyup="setTimeout(function(word){ return function(){ fast_filter(word);}}(this.value),1000);" style="width:100%;padding:0 -20px 0 0; padding:2px;" onfocus="this.select();" /></span><script type="text/javascript">document.getElementById(\'NavFilter\').style.display=\'\';</script>'; + echo '<span id=\'NavFilter\' style="display:none;"><span onclick="document.getElementById(\'fast_filter\').value=\'\'; fast_filter(\'\');document.getElementById(\'fast_filter\').focus();" style="background:white;color:black;cursor:pointer;padding:2px;margin:0 0 0 -20px;position:relative;float:right;" title="' . $strReset . '">X</span><input type="text" name="fast_filter" id="fast_filter" title="' . $strNavTableFilter . '" onkeyup="setTimeout(function(word){ return function(){ fast_filter(word);}}(this.value),1000);" style="width:90%;padding:0 -20px 0 0; padding:2px;" onfocus="this.select();" /></span><script type="text/javascript">document.getElementById(\'NavFilter\').style.display=\'\';</script>'; } /** hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1146-g251403e

by Michal Čihař

The branch, master has been updated via 251403e61741b961bc73a4edbe11b2e055dd19ef (commit) via eb5e03880e579d572ec8e45a8fc0777929defddc (commit) from 07eca26675e2b5d3ddb0d771fa198e3d186b3073 (commit) - Log ----------------------------------------------------------------- commit 251403e61741b961bc73a4edbe11b2e055dd19ef Merge: 07eca26675e2b5d3ddb0d771fa198e3d186b3073 eb5e03880e579d572ec8e45a8fc0777929defddc Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 31 14:32:37 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/xls.php | 1 + libraries/export/xlsx.php | 37 +++++++++++++++++++------------------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f37695..f1694a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ $Id$ - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut - patch #2979234 [import] Create tables with current charset and collation. - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. +- bug #2973280 [export] Proper handling of temporary directory in XLS export. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/export/xls.php b/libraries/export/xls.php index b450d6f..efbb481 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -59,6 +59,7 @@ function PMA_exportFooter() { $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_'); $workbookWriter = new PHPExcel_Writer_Excel5($workbook); + $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 5a8ec70..86a17a9 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -55,18 +55,19 @@ function PMA_exportComment($text) { function PMA_exportFooter() { global $workbook; global $tmp_filename; - + $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_'); - + $workbookWriter = new PHPExcel_Writer_Excel2007($workbook); + $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); - + if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { return FALSE; } - + unlink($tmp_filename); - + unset($GLOBALS['workbook']); unset($GLOBALS['sheet_index']); @@ -82,17 +83,17 @@ function PMA_exportFooter() { */ function PMA_exportHeader() { global $db; - + /* Initialize the workbook */ $GLOBALS['workbook'] = new PHPExcel(); $GLOBALS['sheet_index'] = 0; global $workbook; - + $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION); $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION); $workbook->getProperties()->setTitle($db); $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLSX Dump'); - + return TRUE; } @@ -106,8 +107,8 @@ function PMA_exportHeader() { * @access public */ function PMA_exportDBHeader($db) { - - + + return TRUE; } @@ -153,33 +154,33 @@ function PMA_exportDBCreate($db) { function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $workbook; global $sheet_index; - + /** * Get the data from the database using the original query */ $result = PMA_DBI_fetch_result($sql_query); $row_cnt = count($result); - + if ($row_cnt > 0) { $col_names = array_keys($result[0]); $fields_cnt = count($result[0]); $row_offset = 1; - + /* Only one sheet is created on workbook initialization */ if ($sheet_index > 0) { $workbook->createSheet(); } - + $workbook->setActiveSheetIndex($sheet_index); $workbook->getActiveSheet()->setTitle(substr($table, 0, 31)); - + if (isset($GLOBALS['xlsx_columns']) && $GLOBALS['xlsx_columns']) { for ($i = 0; $i < $fields_cnt; ++$i) { $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]); } $row_offset++; } - + for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) { for ($c = 0; $c < $fields_cnt; ++$c) { if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) { @@ -194,10 +195,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } } - + $sheet_index++; } - + return TRUE; } hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-84-geb5e038

by Michal Čihař

The branch, QA_3_3 has been updated via eb5e03880e579d572ec8e45a8fc0777929defddc (commit) from 1e984375b6ab0253b8c1860b55a11e705be772c0 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/xls.php | 1 + libraries/export/xlsx.php | 37 +++++++++++++++++++------------------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b902ce..61e090d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut - patch #2979234 [import] Create tables with current charset and collation. - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. +- bug #2973280 [export] Proper handling of temporary directory in XLS export. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/export/xls.php b/libraries/export/xls.php index b450d6f..efbb481 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -59,6 +59,7 @@ function PMA_exportFooter() { $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_'); $workbookWriter = new PHPExcel_Writer_Excel5($workbook); + $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 5a8ec70..86a17a9 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -55,18 +55,19 @@ function PMA_exportComment($text) { function PMA_exportFooter() { global $workbook; global $tmp_filename; - + $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_'); - + $workbookWriter = new PHPExcel_Writer_Excel2007($workbook); + $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir'])); $workbookWriter->save($tmp_filename); - + if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) { return FALSE; } - + unlink($tmp_filename); - + unset($GLOBALS['workbook']); unset($GLOBALS['sheet_index']); @@ -82,17 +83,17 @@ function PMA_exportFooter() { */ function PMA_exportHeader() { global $db; - + /* Initialize the workbook */ $GLOBALS['workbook'] = new PHPExcel(); $GLOBALS['sheet_index'] = 0; global $workbook; - + $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION); $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION); $workbook->getProperties()->setTitle($db); $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLSX Dump'); - + return TRUE; } @@ -106,8 +107,8 @@ function PMA_exportHeader() { * @access public */ function PMA_exportDBHeader($db) { - - + + return TRUE; } @@ -153,33 +154,33 @@ function PMA_exportDBCreate($db) { function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $workbook; global $sheet_index; - + /** * Get the data from the database using the original query */ $result = PMA_DBI_fetch_result($sql_query); $row_cnt = count($result); - + if ($row_cnt > 0) { $col_names = array_keys($result[0]); $fields_cnt = count($result[0]); $row_offset = 1; - + /* Only one sheet is created on workbook initialization */ if ($sheet_index > 0) { $workbook->createSheet(); } - + $workbook->setActiveSheetIndex($sheet_index); $workbook->getActiveSheet()->setTitle(substr($table, 0, 31)); - + if (isset($GLOBALS['xlsx_columns']) && $GLOBALS['xlsx_columns']) { for ($i = 0; $i < $fields_cnt; ++$i) { $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]); } $row_offset++; } - + for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) { for ($c = 0; $c < $fields_cnt; ++$c) { if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) { @@ -194,10 +195,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { } } } - + $sheet_index++; } - + return TRUE; } hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1144-g07eca26

by Michal Čihař

The branch, master has been updated via 07eca26675e2b5d3ddb0d771fa198e3d186b3073 (commit) via 1e984375b6ab0253b8c1860b55a11e705be772c0 (commit) via 428ed49d17533adb5444d85e8b194883fea99bb5 (commit) from 7b754395e9b2fa7eb231f6aedb6ba88f9be55925 (commit) - Log ----------------------------------------------------------------- commit 07eca26675e2b5d3ddb0d771fa198e3d186b3073 Merge: 7b754395e9b2fa7eb231f6aedb6ba88f9be55925 1e984375b6ab0253b8c1860b55a11e705be772c0 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 31 14:26:08 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/import.lib.php | 2 +- libraries/import/ods.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 165dd4f..1f37695 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,8 @@ $Id$ thanks to Kaarel Nummert - kaarelnu - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut +- patch #2979234 [import] Create tables with current charset and collation. +- patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 9d2ccd2..8ef3249 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -938,7 +938,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $tempSQLStr .= ", "; } } - $tempSQLStr .= ") ENGINE=MyISAM;"; + $tempSQLStr .= ") ENGINE=MyISAM DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation . ";"; /** * Each SQL statement is executed immediately diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 89701ec..81aed5e 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -68,7 +68,7 @@ unset($data); * result in increased performance without the need to * alter the code in any way. It's basically a freebee. */ -$xml = simplexml_load_string(utf8_encode($buffer), "SimpleXMLElement", LIBXML_COMPACT); +$xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); unset($buffer); hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-83-g1e98437

by Michal Čihař

The branch, QA_3_3 has been updated via 1e984375b6ab0253b8c1860b55a11e705be772c0 (commit) via 428ed49d17533adb5444d85e8b194883fea99bb5 (commit) from fad777ecb23ac323ba4b1a86220f8b4b7c612306 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/import.lib.php | 2 +- libraries/import/ods.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf576c2..0b902ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to Kaarel Nummert - kaarelnu - patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ - patch #2977725 [export] XML wrongly encoded, thanks to Victor Volkov - hanut +- patch #2979234 [import] Create tables with current charset and collation. +- patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/import.lib.php b/libraries/import.lib.php index ca2ac2c..2f50c5d 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -947,7 +947,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $tempSQLStr .= ", "; } } - $tempSQLStr .= ") ENGINE=MyISAM;"; + $tempSQLStr .= ") ENGINE=MyISAM DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation . ";"; /** * Each SQL statement is executed immediately diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 89701ec..81aed5e 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -68,7 +68,7 @@ unset($data); * result in increased performance without the need to * alter the code in any way. It's basically a freebee. */ -$xml = simplexml_load_string(utf8_encode($buffer), "SimpleXMLElement", LIBXML_COMPACT); +$xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); unset($buffer); hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1141-g7b75439

by Michal Čihař

The branch, master has been updated via 7b754395e9b2fa7eb231f6aedb6ba88f9be55925 (commit) via a6371c10d56cbcbe5d6dfb2562cd9f3674994810 (commit) from dc50f8bac53cb9954a86df063bbbbea7bf51edc2 (commit) - Log ----------------------------------------------------------------- commit 7b754395e9b2fa7eb231f6aedb6ba88f9be55925 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 31 12:29:21 2010 +0200 Provide way for vendors to easily change paths to config files. commit a6371c10d56cbcbe5d6dfb2562cd9f3674994810 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 31 12:20:44 2010 +0200 Remove Id. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + README.VENDOR | 2 -- libraries/auth/cookie.auth.lib.php | 10 +++++----- libraries/auth/http.auth.lib.php | 8 ++++---- libraries/common.inc.php | 4 ++-- libraries/footer.inc.php | 4 ++-- libraries/header.inc.php | 4 ++-- libraries/vendor_config.php | 21 +++++++++++++++++++++ show_config_errors.php | 4 +++- 9 files changed, 40 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23198f2..165dd4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ $Id$ Martynas Mickevičius + patch #2967320 [designer] Colored relations based on the primary key, thanks to GreenRover - greenrover +- [core] Provide way for vendors to easily change paths to config files. 3.3.2.0 (not yet released) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/README.VENDOR b/README.VENDOR index 5f824af..3da155c 100644 --- a/README.VENDOR +++ b/README.VENDOR @@ -1,5 +1,3 @@ -$Id: README 10967 2007-12-08 12:46:36Z lem9 $ - phpMyAdmin - hints for distributing phpMyAdmin ============================================== diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index 2ae3d2f..0ea4a81 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -199,8 +199,8 @@ if (top != self) { <body class="loginform"> <?php - if (file_exists('./config.header.inc.php')) { - require './config.header.inc.php'; + if (file_exists(CUSTOM_HEADER_FILE)) { + require CUSTOM_HEADER_FILE; } ?> @@ -343,8 +343,8 @@ window.setTimeout('PMA_focusInput()', 500); // ]]> </script> <?php - if (file_exists('./config.footer.inc.php')) { - require './config.footer.inc.php'; + if (file_exists(CUSTOM_FOOTER_FILE)) { + require CUSTOM_FOOTER_FILE; } ?> </body> @@ -682,7 +682,7 @@ function PMA_auth_fails() } } } elseif (PMA_DBI_getError()) { - $conn_error = '#' . $GLOBALS['errno'] . ' ' . $GLOBALS['strCannotLogin']; + $conn_error = '#' . $GLOBALS['errno'] . ' ' . $GLOBALS['strCannotLogin']; } else { $conn_error = $GLOBALS['strCannotLogin']; } diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index af1b353..8d67cb4 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -55,8 +55,8 @@ function PMA_auth() </head> <body> <?php - if (file_exists('./config.header.inc.php')) { - require './config.header.inc.php'; + if (file_exists(CUSTOM_HEADER_FILE)) { + require CUSTOM_HEADER_FILE; } ?> @@ -69,8 +69,8 @@ function PMA_auth() <?php PMA_Message::error('strWrongUser')->display(); - if (file_exists('./config.footer.inc.php')) { - require './config.footer.inc.php'; + if (file_exists(CUSTOM_FOOTER_FILE)) { + require CUSTOM_FOOTER_FILE; } ?> diff --git a/libraries/common.inc.php b/libraries/common.inc.php index fd4f3d1..a81d197 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -288,7 +288,7 @@ if (! function_exists('preg_replace')) { * force reading of config file, because we removed sensitive values * in the previous iteration */ -$GLOBALS['PMA_Config'] = new PMA_Config('./config.inc.php'); +$GLOBALS['PMA_Config'] = new PMA_Config(CONFIG_FILE); if (!defined('PMA_MINIMUM_COMMON')) { $GLOBALS['PMA_Config']->checkPmaAbsoluteUri(); @@ -589,7 +589,7 @@ require_once './libraries/select_lang.lib.php'; if ($GLOBALS['PMA_Config']->error_config_file) { $error = $strConfigFileError . '<br /><br />' - . ($GLOBALS['PMA_Config']->getSource() == './config.inc.php' ? + . ($GLOBALS['PMA_Config']->getSource() == CONFIG_FILE ? '<a href="show_config_errors.php"' .' target="_blank">' . $GLOBALS['PMA_Config']->getSource() . '</a>' : diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index 09f8d5c..7f7f344 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -200,8 +200,8 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>"); } // Include possible custom footers -if (file_exists('./config.footer.inc.php')) { - require './config.footer.inc.php'; +if (file_exists(CUSTOM_FOOTER_FILE)) { + require CUSTOM_FOOTER_FILE; } diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 18a327b..324852b 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -47,8 +47,8 @@ if (empty($GLOBALS['is_header_sent'])) { <?php // Include possible custom headers - if (file_exists('./config.header.inc.php')) { - require './config.header.inc.php'; + if (file_exists(CUSTOM_HEADER_FILE)) { + require CUSTOM_HEADER_FILE; } diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 90e8a35..35b6dea 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -34,4 +34,25 @@ define('SETUP_CONFIG_FILE', './config/config.inc.php'); */ define('SETUP_DIR_WRITABLE', true); +/** + * Directory where configuration files are stored. + * It is not used directly in code, just a convenient + * define used further in this file. + */ +define('CONFIG_DIR', './'); + +/** + * Filename of a configuration file. + */ +define('CONFIG_FILE', CONFIG_DIR . 'config.inc.php'); + +/** + * Filename of custom header file. + */ +define('CUSTOM_HEADER_FILE', CONFIG_DIR . 'config.header.inc.php'); + +/** + * Filename of custom footer file. + */ +define('CUSTOM_FOOTER_FILE', CONFIG_DIR . 'config.footer.inc.php'); ?> diff --git a/show_config_errors.php b/show_config_errors.php index e9bb4e5..8b1cd18 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -7,12 +7,14 @@ * @package phpMyAdmin */ +require './libraries/vendor_config.php'; + echo "Starting to parse config file...\n"; error_reporting(E_ALL); /** * Read config file. */ -require './config.inc.php'; +require CONFIG_FILE; ?> hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1139-gdc50f8b

by Michal Čihař

The branch, master has been updated via dc50f8bac53cb9954a86df063bbbbea7bf51edc2 (commit) via 47f82c53ff4fcefbd6bc4120a5314c9522cc0d5e (commit) via 9c996e7815b0d605912d01546e0d73f4182e74ed (commit) via 4749f8f2423a222218fa22d7c9f9def002fdaf50 (commit) via 8e4bde20283b1bfe960f7a611542344b322a3d4c (commit) via d10a0b9ad0e7cbd582a7ea371d1a700f35f53a11 (commit) via f42c76221ef47afaeef86dbdcb89fce74f9a7e87 (commit) via aae180922532c36882e35596074c0ce52a944193 (commit) via 09ea903d12c048457ca0f3d59f4708cece1da5fd (commit) via d6151c992968000a32f9ef8c98f9823d46f715db (commit) via e741bb13c19999ee7baaa6f792df1433c4642e49 (commit) via 766c68e637ec90210e04f2a18c259b06b512912d (commit) via 939be9f152a7e2f00526badde49e05b90ed710b3 (commit) via ba9fd85127f2fe7fdeeaf4780ef98f2ba2c6af29 (commit) via 38134dd9ef2f484c0de5767fd2772383f274a9b1 (commit) via dd848c330ccee2e02fc3897190e06f653ccec27b (commit) via 5172fc829caedd233ba5c0dee7bc196af99a54f2 (commit) via 8547ff95334347217abb65af7e9c73db9c6ca894 (commit) via 2d157ba51c0728244e6c236c6a34489419fa546d (commit) via daf00a8fbb65083e631e8281fb1804ac5c1752f9 (commit) via 9040cc82161064dc67de6a6bacff59f9995f5b7d (commit) via 9b7a012bccb711467edfdb0a743e717dca921fba (commit) via a2a9b996e331fc0a2468251376d173e7a44c2832 (commit) via 299c51c59e70b9caf602c80b69853520314ac367 (commit) from ec053542f51da8c05d2d743f40ee930a18ee5b20 (commit) - Log ----------------------------------------------------------------- commit dc50f8bac53cb9954a86df063bbbbea7bf51edc2 Merge: ec053542f51da8c05d2d743f40ee930a18ee5b20 47f82c53ff4fcefbd6bc4120a5314c9522cc0d5e Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 31 10:48:11 2010 +0200 Merge remote branch 'pootle/master' commit 47f82c53ff4fcefbd6bc4120a5314c9522cc0d5e Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:40:28 2010 +0200 Translation update done using Pootle. commit 9c996e7815b0d605912d01546e0d73f4182e74ed Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:40:18 2010 +0200 Translation update done using Pootle. commit 4749f8f2423a222218fa22d7c9f9def002fdaf50 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:39:03 2010 +0200 Translation update done using Pootle. commit 8e4bde20283b1bfe960f7a611542344b322a3d4c Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:38:53 2010 +0200 Translation update done using Pootle. commit d10a0b9ad0e7cbd582a7ea371d1a700f35f53a11 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:38:31 2010 +0200 Translation update done using Pootle. commit f42c76221ef47afaeef86dbdcb89fce74f9a7e87 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:38:22 2010 +0200 Translation update done using Pootle. commit aae180922532c36882e35596074c0ce52a944193 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:38:10 2010 +0200 Translation update done using Pootle. commit 09ea903d12c048457ca0f3d59f4708cece1da5fd Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:37:45 2010 +0200 Translation update done using Pootle. commit d6151c992968000a32f9ef8c98f9823d46f715db Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:37:23 2010 +0200 Translation update done using Pootle. commit e741bb13c19999ee7baaa6f792df1433c4642e49 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:37:07 2010 +0200 Translation update done using Pootle. commit 766c68e637ec90210e04f2a18c259b06b512912d Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:36:32 2010 +0200 Translation update done using Pootle. commit 939be9f152a7e2f00526badde49e05b90ed710b3 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:36:26 2010 +0200 Translation update done using Pootle. commit ba9fd85127f2fe7fdeeaf4780ef98f2ba2c6af29 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:36:04 2010 +0200 Translation update done using Pootle. commit 38134dd9ef2f484c0de5767fd2772383f274a9b1 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:35:54 2010 +0200 Translation update done using Pootle. commit dd848c330ccee2e02fc3897190e06f653ccec27b Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:35:39 2010 +0200 Translation update done using Pootle. commit 5172fc829caedd233ba5c0dee7bc196af99a54f2 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:35:30 2010 +0200 Translation update done using Pootle. commit 8547ff95334347217abb65af7e9c73db9c6ca894 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:35:19 2010 +0200 Translation update done using Pootle. commit 2d157ba51c0728244e6c236c6a34489419fa546d Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:35:04 2010 +0200 Translation update done using Pootle. commit daf00a8fbb65083e631e8281fb1804ac5c1752f9 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:34:42 2010 +0200 Translation update done using Pootle. commit 9040cc82161064dc67de6a6bacff59f9995f5b7d Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:34:28 2010 +0200 Translation update done using Pootle. commit 9b7a012bccb711467edfdb0a743e717dca921fba Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:34:02 2010 +0200 Translation update done using Pootle. commit a2a9b996e331fc0a2468251376d173e7a44c2832 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:33:50 2010 +0200 Translation update done using Pootle. commit 299c51c59e70b9caf602c80b69853520314ac367 Author: hey_neken <hey_neken(a)mundurat.net> Date: Wed Mar 31 10:33:12 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/eu.po | 57 +++++++++++++++++++++++++++------------------------------ 1 files changed, 27 insertions(+), 30 deletions(-) diff --git a/po/eu.po b/po/eu.po index 60be060..1c7268e 100644 --- a/po/eu.po +++ b/po/eu.po @@ -4,13 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-30 23:18+0200\n" -"PO-Revision-Date: 2010-03-12 09:12+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-31 10:40+0200\n" +"Last-Translator: <hey_neken(a)mundurat.net>\n" "Language-Team: basque <eu(a)li.org>\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 1.5.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" #: libraries/auth/config.auth.lib.php:107 #, php-format @@ -33,17 +35,15 @@ msgstr "" #. l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:411 -#, fuzzy msgctxt "$mysql_5_1_doc_lang" msgid "en" -msgstr "Bidalita" +msgstr "en" #. l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:415 -#, fuzzy msgctxt "$mysql_5_0_doc_lang" msgid "en" -msgstr "Bidalita" +msgstr "en" #: libraries/Message.class.php:282 #, php-format @@ -208,9 +208,8 @@ msgid "Action" msgstr "Ekintza" #: libraries/messages.inc.php:32 -#, fuzzy msgid "Actions" -msgstr "Ekintza" +msgstr "Ekintzak" #: libraries/messages.inc.php:33 msgid "Add AUTO_INCREMENT value" @@ -219,7 +218,7 @@ msgstr "Gehitu AUTO_INCREMENT balioa" #: libraries/messages.inc.php:34 #, php-format msgid "Add %s" -msgstr "" +msgstr "%s gehitu" #: libraries/messages.inc.php:35 msgid "Add constraints" @@ -234,9 +233,9 @@ msgid "Add/Delete Criteria Row" msgstr "Gehitu/ezabatu irizpide-errenkada" #: libraries/messages.inc.php:38 -#, fuzzy, php-format +#, php-format msgid "Add %s field(s)" -msgstr "Eremu berria gehitu" +msgstr "Gehitu %s zutabe" #: libraries/messages.inc.php:39 msgid "Add custom comment into header (\\n splits lines)" @@ -294,12 +293,11 @@ msgstr "Erregistro berria gehitu" #: libraries/messages.inc.php:52 msgid "Edit next row" -msgstr "" +msgstr "Editatu hurrengo lerroa" #: libraries/messages.inc.php:53 -#, fuzzy msgid "Go back to this page" -msgstr "Itzuli" +msgstr "Egin atzera orri honetara" #: libraries/messages.inc.php:54 msgid "All" @@ -322,7 +320,7 @@ msgstr "Taularen \"Order By\" aldatu" #: libraries/messages.inc.php:58 msgid "Analyze" -msgstr "" +msgstr "Aztertu" #: libraries/messages.inc.php:59 msgid "Analyze table" @@ -330,33 +328,32 @@ msgstr "Taula aztertu" #: libraries/messages.inc.php:60 msgid "And" -msgstr "eta" +msgstr "Eta" #: libraries/messages.inc.php:61 -#, fuzzy msgid "and" msgstr "eta" #: libraries/messages.inc.php:62 msgid "and then" -msgstr "" +msgstr "eta orduan" #: libraries/messages.inc.php:63 msgid "Angular links" -msgstr "" +msgstr "Esteka angularrak" #: libraries/messages.inc.php:64 #, php-format msgid "An index has been added on %s" -msgstr "Indize bat gehitu da hemen: %s" +msgstr "Indize bat gehitu gehitu zaio %s-(r)i" #: libraries/messages.inc.php:65 msgid "Any" -msgstr "edozein" +msgstr "Edozein" #: libraries/messages.inc.php:66 msgid "Any host" -msgstr "Edozein zerbitzari" +msgstr "Edozein ostalari" #: libraries/messages.inc.php:67 msgid "Any user" @@ -364,7 +361,7 @@ msgstr "Edozein erabiltzaile" #: libraries/messages.inc.php:68 msgid "Apply Selected Changes" -msgstr "" +msgstr "Aplikatu aukeratutako aldaketak" #: libraries/messages.inc.php:69 msgid "" @@ -375,7 +372,7 @@ msgstr "" #: libraries/messages.inc.php:70 #, php-format msgid "A primary key has been added on %s" -msgstr "Lehen mailako gakoa gehitu da hemen: %s" +msgstr "Lehen mailako gakoa gehitu zaio %s-(r)i" #: libraries/messages.inc.php:71 msgid "Arabic" @@ -391,19 +388,19 @@ msgstr "Goranzko" #: libraries/messages.inc.php:74 msgid "As defined:" -msgstr "" +msgstr "Honela definitua:" #: libraries/messages.inc.php:75 msgid "At Beginning of Table" -msgstr "Taularen hasiera" +msgstr "Taularen hasieran" #: libraries/messages.inc.php:76 msgid "At End of Table" -msgstr "Taularen amaiera" +msgstr "Taularen amaieran" #: libraries/messages.inc.php:77 msgid "Attributes" -msgstr "Ezaugarriak" +msgstr "Atributuak" #: libraries/messages.inc.php:78 msgid "Automatic layout" @@ -3250,7 +3247,7 @@ msgstr "Pribilegiorik ez." #: libraries/messages.inc.php:723 msgid "Privileges" -msgstr "Probilegioak" +msgstr "Pribilegioak" #: libraries/messages.inc.php:724 msgid "The privileges were reloaded successfully." hooks/post-receive -- phpMyAdmin

14 years, 1 month

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1115-gec05354

by Michal Čihař

The branch, master has been updated via ec053542f51da8c05d2d743f40ee930a18ee5b20 (commit) via fad777ecb23ac323ba4b1a86220f8b4b7c612306 (commit) from dad105b4fe9482d11e58deb288c6a3f5d8c3d776 (commit) - Log ----------------------------------------------------------------- commit ec053542f51da8c05d2d743f40ee930a18ee5b20 Merge: dad105b4fe9482d11e58deb288c6a3f5d8c3d776 fad777ecb23ac323ba4b1a86220f8b4b7c612306 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Mar 31 10:28:40 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: pdf_schema.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pdf_schema.php b/pdf_schema.php index 99a9b33..80972aa 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -893,7 +893,7 @@ class PMA_RT { $pdf->SetDrawColor(200, 200, 200); // Draws horizontal lines for ($l = 0; $l < 21; $l++) { - $pdf->line(0, $l * 10, $pdf->fh, $l * 10); + $pdf->line(0, $l * 10, $pdf->getFh(), $l * 10); // Avoid duplicates if ($l > 0) { $pdf->SetXY(0, $l * 10); @@ -903,7 +903,7 @@ class PMA_RT { } // end for // Draws vertical lines for ($j = 0; $j < 30 ;$j++) { - $pdf->line($j * 10, 0, $j * 10, $pdf->fw); + $pdf->line($j * 10, 0, $j * 10, $pdf->getFw()); $pdf->SetXY($j * 10, 0); $label = (string) sprintf('%.0f', ($j * 10 - $this->l_marg) * $this->scale + $this->x_min); $pdf->Cell(5, 7, $label); hooks/post-receive -- phpMyAdmin

14 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2010