- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_3RC1-3-g80dc561
by Marc Delisle 01 May '10

01 May '10

The branch, TESTING has been updated via 80dc561011fe54101cb1d7b4665e224d9101cc93 (commit) via 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) via 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) via ef2a411db9b005956705c4c3b577f2848189ec26 (commit) via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit) via 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit) via bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit) via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) via 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) via acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit) via 769aec95effaa407fc62778a23549b902fd586d9 (commit) via 69dd779f407a41d9b6ea5b8c7418cfac322368cb (commit) via b6132c51540b24d821641d0a2c7a749bbc55d813 (commit) via 30acade5a799a77321a9a1e2f7f97681f4e8b401 (commit) via 55572a531ca411d9a449f409150ffb0836a111d9 (commit) via 96071655352ab316d2760c141613bebb72c8b2db (commit) via a879b646202566cc5895a7b28c89016bb323e64c (commit) via f73b0e0195be22ee89c244e26301051f4d7a1933 (commit) via d0d24a6e714646a3660c64549382c07375967feb (commit) via a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit) via b3c041bb997b939f96c58a330f9ea9168aef738b (commit) via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit) via c9d7a662101b57abe754393ab6424b05ab0e685f (commit) via 5113ef198fad589f7952b9982062ce2aba1847d4 (commit) via c454825bca7e291019a89a258d9873cd37f93771 (commit) via f10f34fc6d9a3c894fda81347e78c3e6a0f38fa3 (commit) via 0fc25ac29348166b85a272400c4f28466d343f29 (commit) via 8a7b66f3a0e0a45d87ba60cdbf72b417d80194b9 (commit) via 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 (commit) from 6e17d8629c46da6cd88fa91f4be6dcb732169ebe (commit) - Log ----------------------------------------------------------------- commit 80dc561011fe54101cb1d7b4665e224d9101cc93 Merge: 6e17d8629c46da6cd88fa91f4be6dcb732169ebe 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 17:07:27 2010 -0400 Merge branch 'MAINT_3_3_3' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 24 ++++++++++++++++++++++++ Documentation.html | 6 +++--- README | 4 ++-- libraries/Config.class.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/String.php | 6 +++++- libraries/common.lib.php | 13 ++++++++++++- libraries/display_tbl.lib.php | 2 +- libraries/engines/innodb.lib.php | 2 +- libraries/select_lang.lib.php | 4 ++-- libraries/server_synchronize.lib.php | 16 +++++++++------- navigation.php | 12 +++++++++++- pdf_schema.php | 6 +++--- pmd_general.php | 2 +- scripts/create_tables.sql | 12 +++++++----- tbl_change.php | 2 +- tbl_operations.php | 18 +++++++++++++++--- tbl_structure.php | 2 +- tbl_tracking.php | 14 ++++++++++---- translators.html | 6 +++--- 19 files changed, 112 insertions(+), 41 deletions(-) mode change 100755 => 100644 libraries/export/mediawiki.php diff --git a/ChangeLog b/ChangeLog index a5c87d3..7772eb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,30 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.3.0 (not yet released) +- patch #2982480 [navi] Do not group if there would be one table in group, + thanks to Lorikeet Lee. +- patch #2983492 [sync] When asking to synchronize Structure and Data, + only Structure is done, thanks to Ankit Gupta - ankitgupta3 +- patch #2984893 [engines] InnoDB storage page emits a warning, + thanks to Madhura Jayaratne - madhuracj +- bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, + thanks to Björn Wiberg - bwiberg +- bug #2983066 [interface] Flush table on table operations shows the query twice, + thanks to Martynas Mickevičius - BlinK_ +- bug #2983060, patch #2987900 [interface] Fix initial state of tables in + designer, thanks to Sutharshan Balachandren. +- bug #2983062, patch #2989408 [engines] Fix warnings when changing table + engine to Maria, thanks to Madhura Jayaratne. +- bug #2974067 [display] non-binary fields shown as hex +- bug #2983065 [operations] Error when changing from Maria to MyISAM engine +- bug #2975408 [tracking] Data too long for column data_sql +- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL +- bug [edit] Avoid selecting UNHEX function by default for a BLOB column for + which editing is protected +- bug #2994168 [structure] Show auto_increment in uppercase +- bug #2993970 [pdf schema] Page numbering in Table of Contents + 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant diff --git a/Documentation.html b/Documentation.html index 330161f..2297d29 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2 - Documentation</title> + <title>phpMyAdmin 3.3.3-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2 + 3.3.3-rc1 Documentation </h1> </div> @@ -4999,7 +4999,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai". </div> <ul id="footer"> - <li>Copyright © 2003 - 2009 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> + <li>Copyright © 2003 - 2010 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> <li><a href="LICENSE">License</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> diff --git a/README b/README index ae0af44..674ddef 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.2 - ------------- + Version 3.3.3-rc1 + ----------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 89ef2cf..2e12514 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.2'); + $this->set('PMA_VERSION', '3.3.3-rc1'); /** * @deprecated */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php index b6a17a3..8a105f0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/String.php +++ b/libraries/PHPExcel/PHPExcel/Shared/String.php @@ -97,7 +97,11 @@ class PHPExcel_Shared_String return self::$_isIconvEnabled; } - self::$_isIconvEnabled = function_exists('iconv') ? + // IBM AIX iconv() does not work + self::$_isIconvEnabled = function_exists('iconv') && + !(defined('PHP_OS') && @stristr(PHP_OS, 'AIX') && defined('ICONV_IMPL') + && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && defined('ICONV_VERSION') + && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) ? true : false; return self::$_isIconvEnabled; diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d9ff7c5..2e18474 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1397,7 +1397,7 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0) $return_value = PMA_formatNumber($value, 0); } - return array($return_value, $unit); + return array(trim($return_value), $unit); } // end of the 'PMA_formatByteDown' function /** @@ -2596,6 +2596,17 @@ function PMA_printable_bit_value($value, $length) { } /** + * Verifies whether the value contains a non-printable character + * + * @uses preg_match() + * @param string $value + * @return boolean + */ +function PMA_contains_nonprintable_ascii($value) { + return preg_match('@[^[:print:]]@', $value); +} + +/** * Converts a BIT type default value * for example, b'010' becomes 010 * diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 41bb987..05feefb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1368,7 +1368,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($_SESSION['tmp_user_values']['display_binary']) { // user asked to see the real contents of BINARY // fields - if ($_SESSION['tmp_user_values']['display_binary_as_hex']) { + if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && PMA_contains_nonprintable_ascii($row[$i])) { $row[$i] = bin2hex($row[$i]); } else { diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 894d7ed..44e53f7 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -109,7 +109,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, ), 'innodb_table_locks' => array( - 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, + 'type' => PMA_ENGINE_DETAILS_TYPE_BOOLEAN, ), 'innodb_thread_concurrency' => array( 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php old mode 100755 new mode 100644 diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index c1589c4..5e5762a 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -68,9 +68,9 @@ function PMA_langCheck() if (! empty($_COOKIE['pma_lang'])) { if (PMA_langSet($_COOKIE['pma_lang'])) { return true; - } elseif (!is_string($_COOKIE['lang'])) { + } elseif (!is_string($_COOKIE['pma_lang'])) { /* Faked request, don't care on localisation */ - $GLOBALS['lang_failed_request'] = 'Yes'; + $GLOBALS['lang_failed_cookie'] = 'Yes'; } else { $GLOBALS['lang_failed_cookie'] = $_COOKIE['pma_lang']; } diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 8978cc6..79948b9 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -671,11 +671,11 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) { $display = false; // todo: maybe display some of the queries if they are not too numerous - $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); if (false !== $unbuffered_result) { + $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { - $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES('; + $insert_query .= '('; $key_of_last_value = count($one_row) - 1; foreach($one_row as $key => $value) { $insert_query .= "'" . PMA_sqlAddslashes($value) . "'"; @@ -683,12 +683,14 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom $insert_query .= ","; } } - $insert_query .= ');'; - if ($display == true) { - PMA_displayQuery($insert_query); - } - PMA_DBI_try_query($insert_query, $trg_link, 0); + $insert_query .= '),'; + } + $insert_query = substr($insert_query, 0, -1); + $insert_query .= ';'; + if ($display == true) { + PMA_displayQuery($insert_query); } + PMA_DBI_try_query($insert_query, $trg_link, 0); } } /** diff --git a/navigation.php b/navigation.php index fb5e52c..17d0193 100644 --- a/navigation.php +++ b/navigation.php @@ -554,7 +554,8 @@ function PMA_displayTableList($tables, $visible = false, echo '<ul id="subel' . $element_counter . '" style="display: none">'; } foreach ($tables as $group => $table) { - if (isset($table['is' . $sep . 'group'])) { + // only allow grouping if the group has more than 1 table + if (isset($table['is' . $sep . 'group']) && $table['tab' . $sep . 'count'] > 1) { $common_url_query = $GLOBALS['common_url_query'] . '&tbl_group=' . urlencode($tab_group_full . $group); @@ -610,6 +611,15 @@ function PMA_displayTableList($tables, $visible = false, } echo '</li>' . "\n"; } elseif (is_array($table)) { + // the table was not grouped because it is the only one with its prefix + if (isset($table['is' . $sep . 'group'])) { + // get the array with the actual table information + foreach ($table as $value) { + if(is_array($value)) { + $table = $value; + } + } + } $link_title = PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']); // quick access icon next to each table name echo '<li>' . "\n"; diff --git a/pdf_schema.php b/pdf_schema.php index 552ee32..ce87e97 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1127,7 +1127,7 @@ function PMA_RT_DOC($alltables) $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); @@ -1143,9 +1143,9 @@ function PMA_RT_DOC($alltables) } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables AS $table) { $z++; diff --git a/pmd_general.php b/pmd_general.php index 8fd22fd..6956dd6 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -225,7 +225,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tr> </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" - <?php if (! isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> + <?php if ( isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> <?php $display_field = PMA_getDisplayField($db, $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]); for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++) { diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index de225ee..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- This script expects the user pma to already be existing. If we would put a -- line here to create him too many users might just use this script and end -- up with having the same password for the controluser. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, @@ -185,7 +187,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` ( `date_updated` datetime NOT NULL, `schema_snapshot` text collate utf8_bin NOT NULL, `schema_sql` text collate utf8_bin, - `data_sql` text collate utf8_bin, + `data_sql` longtext collate utf8_bin, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) diff --git a/tbl_change.php b/tbl_change.php index f8cc1c0..d7b86dd 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -482,7 +482,7 @@ foreach ($rows as $row_id => $vrow) { $backup_field = ''; $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); // this will select the UNHEX function while inserting - if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { + if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { $field['display_binary_as_hex'] = true; } } diff --git a/tbl_operations.php b/tbl_operations.php index d045307..98e5f1b 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -95,6 +95,10 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); + if ($is_maria) { + $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; + $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; + } } if (! empty($_REQUEST['tbl_collation']) @@ -153,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) { $reread_info = true; unset($table_alters); foreach (PMA_DBI_get_warnings() as $warning) { - $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] - . ' ' . $warning['Message']; + // In MariaDB 5.1.44, when altering a table from Maria to MyISAM + // and if TRANSACTIONAL was set, the system reports an error; + // I discussed with a Maria developer and he agrees that this + // should not be reported with a Level of Error, so here + // I just ignore it. But there are other 1478 messages + // that it's better to show. + if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) { + $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] + . ' ' . $warning['Message']; + } } } } @@ -193,7 +205,7 @@ unset($reread_info); */ require_once './libraries/tbl_links.inc.php'; -if (isset($result)) { +if (isset($result) && empty($zero_rows)) { // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success'; diff --git a/tbl_structure.php b/tbl_structure.php index 0d966cc..fbe844d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -346,7 +346,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { else { echo '<i>' . $strNoneDefault . '</i>'; } ?></td> - <td nowrap="nowrap"><?php echo $row['Extra']; ?></td> + <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td> <td align="center"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>"> <?php echo $titles['BrowseDistinctValues']; ?></a> diff --git a/tbl_tracking.php b/tbl_tracking.php index fbee82a..224ed87 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -417,8 +417,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['ddlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && @@ -465,8 +468,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['dmlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && diff --git a/translators.html b/translators.html index 00f7ab3..d08bf66 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2 - Official translators</title> + <title>phpMyAdmin 3.3.3-rc1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2 + 3.3.3-rc1 official translators list </h1> </div> @@ -446,7 +446,7 @@ </div> <ul id="footer"> - <li>Copyright © 2003 - 2009 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> + <li>Copyright © 2003 - 2010 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> <li><a href="LICENSE">License</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_3RC1, created. RELEASE_3_3_3RC1
by Marc Delisle 01 May '10

01 May '10

The annotated tag, RELEASE_3_3_3RC1 has been created at ef744df674f0dc22d4977839df1f95f60d1c6dc6 (tag) tagging 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) replaces RELEASE_3_3_2 tagged by Marc Delisle on Sat May 1 17:07:26 2010 -0400 - Log ----------------------------------------------------------------- Released 3.3.3-rc1 Ankit Gupta (1): patch #2983492 When asking to synchronize Structure and Data, only Structure is done Dieter Adriaenssens (1): PHPExcel : IBM AIX iconv() does not work Lorikeet Lee (1): Do not group if there would be one table in group. Madhura Jayaratne (2): Patch #2984893 - InnoDB storage page emits warning [engines] Fix warnings when changing table engine to Maria. Marc Delisle (11): 3.3.1 release 3.3.3-dev 3.3.2 release bug #2974067 non-binary fields shown as hex bug #2983065 Error when changing from Maria to MyISAM engine bug #2975408 Data too long for column data_sql Tracking report should obey MaxCharactersInDisplayedSQL Avoid selecting UNHEX function by default for a BLOB column for which editing is protected bug #2994168 Show auto_increment in uppercase bug #2993970 Page numbering in Table of Contents 3.3.3-rc1 Martynas Mickevičius (1): Patch #2986708: Fix for the bug #2983066 Michal Čihař (12): Fix error handling for language from cookie. Merge remote branch 'origin/MAINT_3_3_1' into QA_3_3 Merge remote branch 'origin/MAINT_3_3_2' into QA_3_3 Merge branch 'MAINT_3_3_2' into QA_3_3 Merge branch 'MAINT_3_3_2' into QA_3_3 Merge branch 'MAINT_3_3_2' into QA_3_3 Merge branch 'MAINT_3_3_2' into QA_3_3 Avoid double spaces. Merge remote branch 'origin/MAINT_3_3_2' into QA_3_3 Update year. Add spaces after -- to avoid problems in strict mode. Fix mermissions. Sutharshan Balachandren (1): [interface] Fix initial state of tables in designer. ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2103-g435a470
by Marc Delisle 01 May '10

01 May '10

The branch, master has been updated via 435a4704450deec7eada39c7446092ad5f8d734a (commit) from 34d51adab71b6edf3b4c8b758699643f4b69149c (commit) - Log ----------------------------------------------------------------- commit 435a4704450deec7eada39c7446092ad5f8d734a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:21:33 2010 -0400 3.3.4.0-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7bc8ec..3a522c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,8 @@ $Id$ + [doc] Incorporate synchronisation docs into main document. + [core] Include Content Security Policy HTTP headers. +3.3.4.0 (not yet released) + 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-31-gf57a5cf
by Marc Delisle 01 May '10

01 May '10

The branch, QA_3_3 has been updated via f57a5cfdf91262e63f2e8a9649412d6fec2dbf54 (commit) from 6b5edbe6db695f364477cf16b907bcd6cedc03f9 (commit) - Log ----------------------------------------------------------------- commit f57a5cfdf91262e63f2e8a9649412d6fec2dbf54 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:20:38 2010 -0400 3.3.4.0-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772eb6..cb8090f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.4.0 (not yet released) + 3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-30-g6b5edbe
by Marc Delisle 01 May '10

01 May '10

The branch, QA_3_3 has been updated via 6b5edbe6db695f364477cf16b907bcd6cedc03f9 (commit) from 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) - Log ----------------------------------------------------------------- commit 6b5edbe6db695f364477cf16b907bcd6cedc03f9 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:19:30 2010 -0400 3.3.4-dev ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation.html b/Documentation.html index c72c690..93d7eed 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-dev - Documentation</title> + <title>phpMyAdmin 3.3.4-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-dev + 3.3.4-dev Documentation </h1> </div> diff --git a/README b/README index 19c8a90..f9a6e36 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.3-dev + Version 3.3.4-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 57d4964..820cdc8 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.3-dev'); + $this->set('PMA_VERSION', '3.3.4-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index fbbe5f9..bb55c5e 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-dev - Official translators</title> + <title>phpMyAdmin 3.3.4-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-dev + 3.3.4-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_3, created. RELEASE_3_3_2-30-g5f8c1f9
by Marc Delisle 01 May '10

01 May '10

The branch, MAINT_3_3_3 has been created at 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) - Log ----------------------------------------------------------------- commit 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 1 15:14:18 2010 -0400 3.3.3-rc1 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2102-g34d51ad
by Michal Čihař 30 Apr '10

30 Apr '10

The branch, master has been updated via 34d51adab71b6edf3b4c8b758699643f4b69149c (commit) from 89c08b468b5fb206bc304b26d36d76a2d3390b8d (commit) - Log ----------------------------------------------------------------- commit 34d51adab71b6edf3b4c8b758699643f4b69149c Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 29 14:44:05 2010 +0200 Fix docstrings. ----------------------------------------------------------------------- Summary of changes: pdf_schema.php | 108 +++++++++++++++++++++++++++---------------------------- 1 files changed, 53 insertions(+), 55 deletions(-) diff --git a/pdf_schema.php b/pdf_schema.php index 79b3c25..bec0ee2 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -99,11 +99,11 @@ class PMA_PDF extends TCPDF { /** * Sets the scaling factor, defines minimum coordinates and margins * - * @param double scale The scaling factor - * @param double x_min The minimum X coordinate - * @param double y_min The minimum Y coordinate - * @param double l_marg The left margin - * @param double t_marg The top margin + * @param float scale The scaling factor + * @param float x_min The minimum X coordinate + * @param float y_min The minimum Y coordinate + * @param float l_marg The left margin + * @param float t_marg The top margin * @access public */ function PMA_PDF_setScale($scale = 1, $x_min = 0, $y_min = 0, $l_marg = -1, $t_marg = -1) @@ -121,13 +121,13 @@ class PMA_PDF extends TCPDF { /** * Outputs a scaled cell * - * @param double $ The cell width - * @param double $ The cell height - * @param string $ The text to output - * @param mixed $ Whether to add borders or not - * @param integer $ Where to put the cursor once the output is done - * @param string $ Align mode - * @param integer $ Whether to fill the cell with a color or not + * @param float w The cell width + * @param float h The cell height + * @param string txt The text to output + * @param mixed border Whether to add borders or not + * @param integer ln Where to put the cursor once the output is done + * @param string align Align mode + * @param integer fill Whether to fill the cell with a color or not * @access public * @see FPDF::Cell() */ @@ -140,10 +140,10 @@ class PMA_PDF extends TCPDF { /** * Draws a scaled line * - * @param double $ The horizontal position of the starting point - * @param double $ The vertical position of the starting point - * @param double $ The horizontal position of the ending point - * @param double $ The vertical position of the ending point + * @param float x1 The horizontal position of the starting point + * @param float y1 The vertical position of the starting point + * @param float x2 The horizontal position of the ending point + * @param float y2 The vertical position of the ending point * @access public * @see FPDF::Line() */ @@ -158,8 +158,8 @@ class PMA_PDF extends TCPDF { /** * Sets x and y scaled positions * - * @param double $ The x position - * @param double $ The y position + * @param float x The x position + * @param float y The y position * @access public * @see FPDF::SetXY() */ @@ -172,7 +172,7 @@ class PMA_PDF extends TCPDF { /** * Sets the X scaled positions * - * @param double $ The x position + * @param float x The x position * @access public * @see FPDF::SetX() */ @@ -184,7 +184,7 @@ class PMA_PDF extends TCPDF { /** * Sets the scaled font size * - * @param double $ The font size (in points) + * @param float size The font size (in points) * @access public * @see FPDF::SetFontSize() */ @@ -197,7 +197,7 @@ class PMA_PDF extends TCPDF { /** * Sets the scaled line width * - * @param double $ The line width + * @param float width The line width * @access public * @see FPDF::SetLineWidth() */ @@ -209,7 +209,7 @@ class PMA_PDF extends TCPDF { /** * Displays an error message * - * @param string $ the error mesage + * @param string error_message the error mesage * @global array the PMA configuration array * @global integer the current server id * @global string the current language @@ -247,7 +247,7 @@ class PMA_PDF extends TCPDF { * Aliases the "Error()" function from the FPDF class to the * "PMA_PDF_die()" one * - * @param string $ the error mesage + * @param string error_message the error mesage * @access public * @see PMA_PDF_die */ @@ -525,7 +525,7 @@ class PMA_RT_Table { /** * Sets the width of the table * - * @param integer $ The font size + * @param integer ff The font size * @global object The current PDF document * @access private * @see PMA_PDF @@ -558,9 +558,8 @@ class PMA_RT_Table { /** * Do draw the table * - * @param integer $ The font size - * @param boolean $ Whether to display color - * @param integer $ The max. with among tables + * @param integer ff The font size + * @param boolean setcolortWhether to display color * @global object The current PDF document * @access private * @see PMA_PDF @@ -613,11 +612,11 @@ class PMA_RT_Table { /** * The "PMA_RT_Table" constructor * - * @param string $ The table name - * @param integer $ The font size - * @param integer $ The max. with among tables - * @param boolean $ Whether to display keys or not - * @param boolean $ Whether to display table position or not + * @param string table_name The table name + * @param integer ff The font size + * @param integer same_width The max. with among tables + * @param boolean show_keys Whether to display keys or not + * @param boolean show_info Whether to display table position or not * @global object The current PDF document * @global integer The current page number (from the * $cfg['Servers'][$i]['table_coords'] table) @@ -709,8 +708,8 @@ class PMA_RT_Relation { /** * Gets arrows coordinates * - * @param string $ The current table name - * @param string $ The relation column name + * @param string table The current table name + * @param string column The relation column name * @return array Arrows coordinates * @access private */ @@ -723,8 +722,8 @@ class PMA_RT_Relation { /** * Do draws relation links * - * @param boolean $ Whether to use one color per relation or not - * @param integer $ The id of the link to draw + * @param boolean change_color Whether to use one color per relation or not + * @param integer i The id of the link to draw * @global object The current PDF document * @access private * @see PMA_PDF @@ -769,10 +768,10 @@ class PMA_RT_Relation { /** * The "PMA_RT_Relation" constructor * - * @param string $ The master table name - * @param string $ The relation field in the master table - * @param string $ The foreign table name - * @param string $ The relation field in the foreign table + * @param string master_table The master table name + * @param string master_field The relation field in the master table + * @param string foreign_table The foreign table name + * @param string foreigh_field The relation field in the foreign table * @access private * @see PMA_RT_Relation::PMA_RT_Relation_getXy */ @@ -845,7 +844,7 @@ class PMA_RT { /** * Sets X and Y minimum and maximum for a table cell * - * @param string $ The table name + * @param string table The table name * @access private */ function PMA_RT_setMinMax($table) @@ -858,11 +857,11 @@ class PMA_RT { /** * Defines relation objects * - * @param string $ The master table name - * @param string $ The relation field in the master table - * @param string $ The foreign table name - * @param string $ The relation field in the foreign table - * @param boolean $ Whether to display table position or not + * @param string master_table The master table name + * @param string master_field The relation field in the master table + * @param string foreign_table The foreign table name + * @param string foreign_field The relation field in the foreign table + * @param boolean show_info Whether to display table position or not * @access private * @see PMA_RT_setMinMax */ @@ -912,7 +911,7 @@ class PMA_RT { /** * Draws relation arrows * - * @param boolean $ Whether to use one color per relation or not + * @param boolean change_color Whether to use one color per relation or not * @access private * @see PMA_RT_Relation::PMA_RT_Relation_draw() */ @@ -927,7 +926,7 @@ class PMA_RT { /** * Draws tables * - * @param boolean $ Whether to display table position or not + * @param boolean draw_color Whether to display table position or not * @access private * @see PMA_RT_Table::PMA_RT_Table_draw() */ @@ -972,16 +971,15 @@ class PMA_RT { /** * The "PMA_RT" constructor * - * @param mixed $ The scaling factor - * @param integer $ The page number to draw (from the + * @param integer which_rel The page number to draw (from the * $cfg['Servers'][$i]['table_coords'] table) - * @param boolean $ Whether to display table position or not - * @param boolean $ Was originally whether to use one color per + * @param boolean show_info Whether to display table position or not + * @param boolean change_color Was originally whether to use one color per * relation or not, now enables/disables color * everywhere, due to some problems printing with color - * @param boolean $ Whether to draw grids or not - * @param boolean $ Whether all tables should have the same width or not - * @param boolean $ Wheter to show all field or only the keys + * @param boolean show_grid Whether to draw grids or not + * @param boolean all_tab_same_wide Whether all tables should have the same width or not + * @param boolean show_keys Wheter to show all field or only the keys * @global object The current PDF document * @global string The current db name * @global array The relations settings hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2101-g89c08b4
by Marc Delisle 29 Apr '10

29 Apr '10

The branch, master has been updated via 89c08b468b5fb206bc304b26d36d76a2d3390b8d (commit) via 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) from 43d80c678b114478276f0a32d2a60627e1ff796c (commit) - Log ----------------------------------------------------------------- commit 89c08b468b5fb206bc304b26d36d76a2d3390b8d Merge: 43d80c678b114478276f0a32d2a60627e1ff796c 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:54:55 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 278d923..a7bc8ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,7 @@ $Id$ - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for which editing is protected - bug #2994168 [structure] Show auto_increment in uppercase +- bug #2993970 [pdf schema] Page numbering in Table of Contents 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/pdf_schema.php b/pdf_schema.php index 2306a15..79b3c25 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1123,7 +1123,7 @@ function PMA_RT_DOC($alltables) $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); @@ -1139,9 +1139,9 @@ function PMA_RT_DOC($alltables) } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables AS $table) { $z++; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-29-g6b50847
by Marc Delisle 29 Apr '10

29 Apr '10

The branch, QA_3_3 has been updated via 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) from ef2a411db9b005956705c4c3b577f2848189ec26 (commit) - Log ----------------------------------------------------------------- commit 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:54:25 2010 -0400 bug #2993970 Page numbering in Table of Contents ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20e1fed..7772eb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for which editing is protected - bug #2994168 [structure] Show auto_increment in uppercase +- bug #2993970 [pdf schema] Page numbering in Table of Contents 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/pdf_schema.php b/pdf_schema.php index 552ee32..ce87e97 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1127,7 +1127,7 @@ function PMA_RT_DOC($alltables) $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); @@ -1143,9 +1143,9 @@ function PMA_RT_DOC($alltables) } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables AS $table) { $z++; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2099-g43d80c6
by Marc Delisle 29 Apr '10

29 Apr '10

The branch, master has been updated via 43d80c678b114478276f0a32d2a60627e1ff796c (commit) via 05a7a9f30724974df30925945cda99c1d25152fc (commit) via ef2a411db9b005956705c4c3b577f2848189ec26 (commit) from a7a986b84c473cd7ef199e652404cd19207dbc57 (commit) - Log ----------------------------------------------------------------- commit 43d80c678b114478276f0a32d2a60627e1ff796c Merge: 05a7a9f30724974df30925945cda99c1d25152fc a7a986b84c473cd7ef199e652404cd19207dbc57 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:34:32 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 05a7a9f30724974df30925945cda99c1d25152fc Merge: 407054b6b147b2d877dc73a9f316045f3615172b ef2a411db9b005956705c4c3b577f2848189ec26 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 29 12:31:10 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_structure.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc81a36..278d923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,7 @@ $Id$ - bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL - bug [edit] Avoid selecting UNHEX function by default for a BLOB column for which editing is protected +- bug #2994168 [structure] Show auto_increment in uppercase 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the diff --git a/tbl_structure.php b/tbl_structure.php index c44fa1a..af42e81 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -361,7 +361,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { else { echo '<i>' . $strNoneDefault . '</i>'; } ?></td> - <td nowrap="nowrap"><?php echo $row['Extra']; ?></td> + <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td> <td align="center"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>"> <?php echo $titles['BrowseDistinctValues']; ?></a> hooks/post-receive -- phpMyAdmin

1 0