Git July 2010

git@phpmyadmin.net

3 participants
161 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-5980-g39aa435
by Michal Čihař 27 Jul '10

27 Jul '10

The branch, master has been updated via 39aa4355a90055611412d7f5c75458427545aef3 (commit) via 01ded03e89e9e92e70c4c29750c34a64e4c2339d (commit) from 442294fa6070649f920f7c841cf4062a1f7189cc (commit) - Log ----------------------------------------------------------------- commit 39aa4355a90055611412d7f5c75458427545aef3 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 10:01:58 2010 +0200 Convert default queries to unified expansion. commit 01ded03e89e9e92e70c4c29750c34a64e4c2339d Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:51:34 2010 +0200 Remove duplicate info. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++-- Documentation.html | 8 +++++--- libraries/common.lib.php | 18 ++++++++++++++++++ libraries/config.default.php | 14 +++----------- libraries/sql_query_form.lib.php | 19 +++---------------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9f6419..2acdf45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,8 +91,9 @@ $Id$ + [core] Dropped AllowAnywhereRecoding configuration variable. - rfe #3016457 [interface] Define tab order in SQL form to allow easier tab navigation. -+ [code] Centralized format string expansion, @VARIABLES@ are recommended way - now. ++ [core] Centralized format string expansion, @VARIABLES@ are recommended way + now, used by file name templates, default queries, export and title + generating. + [validator] SQL validator works also with SOAP PHP extension. - [interface] Better formatting for SQL validator results. - [doc] The linked-tables infrastructure is now called phpMyAdmin diff --git a/Documentation.html b/Documentation.html index d5c5d45..bf9a05a 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2182,9 +2182,9 @@ setfacl -d -m "g:www-data:rwx" tmp <span id="cfg_DefaultQueryDatabase">$cfg['DefaultQueryDatabase']</span> string </dt> <dd>Default queries that will be displayed in query boxes when user didn't - specify any. Use %d for database name, %t for table name and %f for a - comma separated list of column names. Note that %t and %f are only - applicable to <tt>$cfg['DefaultQueryTable']</tt>.</dd> + specify any. You can use standard + <a href="#faq6_27">format string expansion</a>. + </dd> <dt id="cfg_SQP_fmtType">$cfg['SQP']['fmtType'] string [<tt>html</tt>|<tt>none</tt>]</dt> <dd> @@ -4353,6 +4353,8 @@ chmod o+rwx tmp <dd>Currently opened database</dd> <dt><code>@TABLE@</code></dt> <dd>Currently opened table</dd> + <dt><code>@FIELDS@</code></dt> + <dd>Fields of currently opened table</dd> <dt><code>@PHPMYADMIN@</code></dt> <dd>phpMyAdmin with version</dd> </dl> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c9a0f11..9c575c9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2891,6 +2891,24 @@ function PMA_expandUserString($string, $escape = NULL, $updates = array()) { } } + /* Fetch fields list if required */ + if (strpos($string, '@FIELDS@') !== FALSE) { + $fields_list = PMA_DBI_fetch_result( + 'SHOW FULL COLUMNS FROM ' . PMA_backquote($GLOBALS['db']) + . '.' . PMA_backquote($GLOBALS['table'])); + + $field_names = array(); + foreach ($fields_list as $field) { + if (!is_null($escape)) { + $field_names[] = $escape($field['Field']); + } else { + $field_names[] = $field['Field']; + } + } + + $replace['@FIELDS@'] = implode(',', $field_names); + } + /* Do the replacement */ return str_replace(array_keys($replace), array_values($replace), strftime($string)); } diff --git a/libraries/config.default.php b/libraries/config.default.php index 4f71e56..19b0cf0 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2344,22 +2344,14 @@ $cfg['ThemePerServer'] = false; */ /** - * Default queries - * %d will be replaced by the database name. - * %t will be replaced by the table name. - * %f will be replaced by a list of field names. - * (%t and %f only applies to DefaultQueryTable) + * Default query for table * * @global string $cfg['DefaultQueryTable'] */ -$cfg['DefaultQueryTable'] = 'SELECT * FROM %t WHERE 1'; +$cfg['DefaultQueryTable'] = 'SELECT * FROM @TABLE@ WHERE 1'; /** - * Default queries - * %d will be replaced by the database name. - * %t will be replaced by the table name. - * %f will be replaced by a list of field names. - * (%t and %f only applies to DefaultQueryTable) + * Default query for database * * @global string $cfg['DefaultQueryDatabase'] */ diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index faa563a..728c12c 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -40,8 +40,6 @@ require_once './libraries/bookmark.lib.php'; // used for file listing * @uses $GLOBALS['cfg']['DefaultQueryDatabase'] * @uses $GLOBALS['cfg']['Servers'] * @uses $GLOBALS['cfg']['DefaultTabDatabase'] - * @uses $GLOBALS['cfg']['DefaultQueryDatabase'] - * @uses $GLOBALS['cfg']['DefaultQueryTable'] * @uses $GLOBALS['cfg']['Bookmark'] * @uses PMA_generate_common_url() * @uses PMA_backquote() @@ -235,8 +233,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter // $tmp_db_link = htmlspecialchars($db); $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link); if (empty($query)) { - $query = str_replace('%d', - PMA_backquote($db), $GLOBALS['cfg']['DefaultQueryDatabase']); + $query = PMA_expandUserString($GLOBALS['cfg']['DefaultQueryDatabase'], 'PMA_backquote'); } } else { $table = $GLOBALS['table']; @@ -259,18 +256,8 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter // else use // $tmp_db_link = htmlspecialchars($db); $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link); - if (empty($query) && count($fields_list)) { - $field_names = array(); - foreach ($fields_list as $field) { - $field_names[] = PMA_backquote($field['Field']); - } - $query = - str_replace('%d', PMA_backquote($db), - str_replace('%t', PMA_backquote($table), - str_replace('%f', - implode(', ', $field_names), - $GLOBALS['cfg']['DefaultQueryTable']))); - unset($field_names); + if (empty($query)) { + $query = PMA_expandUserString($GLOBALS['cfg']['DefaultQueryTable'], 'PMA_backquote'); } } $legend .= ': ' . PMA_showMySQLDocu('SQL-Syntax', 'SELECT'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-5977-g6405357
by Michal Čihař 27 Jul '10

27 Jul '10

The branch, master has been updated via 6405357c0fae5b218b05391e7080e1fd3d6e4b82 (commit) via 39e4c95813f0f18e0f58cabfc7495ea6bccb6f87 (commit) via 36b632893183c493b93abfa7b96a116a76aedb86 (commit) via 1c17bfc1210f4c013621aabe832c022143124251 (commit) via 659bd9c8385f24ac9fb26838118acad6e372504e (commit) from a47c6e8bea4fa15bf1455e6ac8413ce014a12932 (commit) - Log ----------------------------------------------------------------- commit 6405357c0fae5b218b05391e7080e1fd3d6e4b82 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:43:39 2010 +0200 Changelog entry. commit 39e4c95813f0f18e0f58cabfc7495ea6bccb6f87 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:42:46 2010 +0200 Remove drop/empty table links from table tabs. commit 36b632893183c493b93abfa7b96a116a76aedb86 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:42:08 2010 +0200 Remove drop tab from database tabs. commit 1c17bfc1210f4c013621aabe832c022143124251 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:39:27 2010 +0200 Add drop link to the database operations tab. commit 659bd9c8385f24ac9fb26838118acad6e372504e Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:31:30 2010 +0200 Add trop/empty links to table operations tab. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + db_operations.php | 34 +++++++++++++++++ libraries/db_links.inc.php | 19 --------- libraries/tbl_links.inc.php | 34 +---------------- tbl_operations.php | 48 ++++++++++++++++++++++++ themes/darkblue_orange/css/theme_right.css.php | 7 +++ themes/original/css/theme_right.css.php | 7 +++ 7 files changed, 98 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fd14f1..6930da5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ $Id$ - [interface] Better formatting for SQL validator results. - [doc] The linked-tables infrastructure is now called phpMyAdmin configuration storage. +- [interface] Move drop/empty links from being tabs to Operations tab. 3.3.6.0 (not yet released) - bug #3033063 [core] Navi gets wrong db name diff --git a/db_operations.php b/db_operations.php index eb8c6a2..53a2821 100644 --- a/db_operations.php +++ b/db_operations.php @@ -364,7 +364,41 @@ if (!$is_information_schema) { <input type="submit" value="<?php echo __('Go'); ?>" onclick="return confirmLink(this, 'CREATE DATABASE ... <?php echo __('and then'); ?> DROP DATABASE <?php echo PMA_jsFormat($db); ?>')" /> </fieldset> </form> +<?php +// Drop link if allowed +// Don't even try to drop information_schema. You won't be able to. Believe me. You won't. +// Don't allow to easilly drop mysql database, RFE #1327514. +if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) { +?> +<fieldset class="caution"> + <legend><?php +if ($cfg['PropertiesIconic']) { + echo '<img class="icon" src="' . $pmaThemeImage . 'b_deltbl.png"' + .' alt="" width="16" height="16" />'; +} +echo __('Remove database'); +?></legend> +<ul> +<?php + $this_sql_query = 'DROP DATABASE ' . PMA_backquote($GLOBALS['db']); + $this_url_params = array( + 'sql_query' => $this_sql_query, + 'back' => 'db_operations.php', + 'goto' => 'main.php', + 'reload' => '1', + 'purge' => '1', + 'zero_rows' => sprintf(__('Database %s has been dropped.'), htmlspecialchars(PMA_backquote($db))), + 'db' => NULL, + ); + ?> + <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" onclick="return confirmLinkDropDB(this, '<?php echo PMA_jsFormat($this_sql_query); ?>')"> + <?php echo __('Drop the database (DROP)'); ?></a> + <?php echo PMA_showMySQLDocu('SQL-Syntax', 'DROP_DATABASE'); ?> + </li> +</ul> +</fieldset> +<?php } ?> <?php /** * Copy database diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php index 860d3d8..0dfa5a8 100644 --- a/libraries/db_links.inc.php +++ b/libraries/db_links.inc.php @@ -34,19 +34,6 @@ $is_superuser = PMA_isSuperuser(); /** * Prepares links */ -// Drop link if allowed -// Don't even try to drop information_schema. You won't be able to. Believe me. You won't. -// Don't allow to easilly drop mysql database, RFE #1327514. -if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) { - $tab_drop['link'] = 'sql.php'; - $tab_drop['args']['sql_query'] = 'DROP DATABASE ' . PMA_backquote($db); - $tab_drop['args']['zero_rows'] = sprintf(__('Database %s has been dropped.'), htmlspecialchars(PMA_backquote($db))); - $tab_drop['args']['goto'] = 'main.php'; - $tab_drop['args']['back'] = 'db' . $sub_part . '.php'; - $tab_drop['args']['reload'] = 1; - $tab_drop['args']['purge'] = 1; - $tab_drop['attr'] = 'onclick="return confirmLinkDropDB(this, \'DROP DATABASE ' . PMA_jsFormat($db) . '\')"'; -} /** * export, search and qbe links if there is at least one table @@ -95,9 +82,6 @@ if (! $db_is_information_schema) { $tab_import['link'] = 'db_import.php'; $tab_import['text'] = __('Import'); $tab_import['icon'] = 'b_import.png'; - $tab_drop['text'] = __('Drop'); - $tab_drop['icon'] = 'b_deltbl.png'; - $tab_drop['class'] = 'caution'; $tab_operation['link'] = 'db_operations.php'; $tab_operation['text'] = __('Operations'); $tab_operation['icon'] = 'b_tblops.png'; @@ -132,9 +116,6 @@ if (! $db_is_information_schema) { if ($is_superuser) { $tabs[] =& $tab_privileges; } - if ($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) { - $tabs[] =& $tab_drop; - } } $url_params['db'] = $db; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index ef61293..445cf66 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -91,23 +91,10 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_ $tabs['operation']['icon'] = 'b_tblops.png'; $tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['text'] = __('Operations'); - - $tabs['empty']['link'] = 'sql.php'; - $tabs['empty']['args']['reload'] = 1; - $tabs['empty']['args']['sql_query'] = 'TRUNCATE TABLE ' . PMA_backquote($table); - $tabs['empty']['args']['zero_rows'] = sprintf(__('Table %s has been emptied'), htmlspecialchars($table)); - $tabs['empty']['attr'] = 'onclick="return confirmLink(this, \'TRUNCATE TABLE ' . PMA_jsFormat($table) . '\')"'; - $tabs['empty']['args']['goto'] = 'tbl_structure.php'; - $tabs['empty']['class'] = 'caution'; - $tabs['empty']['icon'] = 'b_empty.png'; - $tabs['empty']['text'] = __('Empty'); - if ($table_info_num_rows == 0) { - $tabs['empty']['warning'] = __('Table seems to be empty!'); - } } /** - * Views support a limited number of operations + * Views support a limited number of operations */ if ($tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) { $tabs['operation']['icon'] = 'b_tblops.png'; @@ -115,25 +102,6 @@ if ($tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_sc $tabs['operation']['text'] = __('Operations'); } -/** - * no drop in information_schema - */ -if (! (isset($db_is_information_schema) && $db_is_information_schema)) { - $tabs['drop']['icon'] = 'b_deltbl.png'; - $tabs['drop']['link'] = 'sql.php'; - $tabs['drop']['url_params'] = array('table' => NULL); - $tabs['drop']['text'] = __('Drop'); - $tabs['drop']['args']['reload'] = 1; - $tabs['drop']['args']['purge'] = 1; - $drop_command = 'DROP ' . ($tbl_is_view ? 'VIEW' : 'TABLE'); - $tabs['drop']['args']['sql_query'] = $drop_command . ' ' . PMA_backquote($table); - $tabs['drop']['args']['goto'] = 'db_structure.php'; - $tabs['drop']['args']['zero_rows'] = sprintf(($tbl_is_view ? __('View %s has been dropped') : __('Table %s has been dropped')), htmlspecialchars($table)); - $tabs['drop']['attr'] = 'onclick="return confirmLink(this, \'' . $drop_command . ' ' . PMA_jsFormat($table) . '\')"'; - unset($drop_command); - $tabs['drop']['class'] = 'caution'; -} - if ($table_info_num_rows == 0 && !$tbl_is_view) { $tabs['browse']['warning'] = __('Table seems to be empty!'); $tabs['search']['warning'] = __('Table seems to be empty!'); diff --git a/tbl_operations.php b/tbl_operations.php index 493a17f..baab85a 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -636,6 +636,54 @@ $this_url_params = array_merge($url_params, </ul> </fieldset> </div> +<?php if (! (isset($db_is_information_schema) && $db_is_information_schema)) { ?> +<div id="div_table_removal"> +<fieldset class="caution"> + <legend><?php echo __('Table removal'); ?></legend> + +<ul> +<?php +if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_schema)) { + $this_sql_query = 'TRUNCATE TABLE ' . PMA_backquote($GLOBALS['table']); + $this_url_params = array_merge($url_params, + array( + 'sql_query' => $this_sql_query, + 'goto' => 'tbl_structure.php', + 'reload' => '1', + 'zero_rows' => sprintf(__('Table %s has been emptied'), htmlspecialchars($table)), + )); + ?> + <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" onclick="return confirmLink(this, '<?php echo PMA_jsFormat($this_sql_query); ?>')"> + <?php echo __('Empty the table (TRUNCATE)'); ?></a> + <?php echo PMA_showMySQLDocu('SQL-Syntax', 'TRUNCATE_TABLE'); ?> + </li> +<?php +} +if (! (isset($db_is_information_schema) && $db_is_information_schema)) { + $this_sql_query = 'DROP TABLE ' . PMA_backquote($GLOBALS['table']); + $this_url_params = array_merge($url_params, + array( + 'sql_query' => $this_sql_query, + 'goto' => 'db_operations.php', + 'reload' => '1', + 'purge' => '1', + 'zero_rows' => sprintf(($tbl_is_view ? __('View %s has been dropped') : __('Table %s has been dropped')), htmlspecialchars($table)), + 'table' => NULL, + )); + ?> + <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" onclick="return confirmLink(this, '<?php echo PMA_jsFormat($this_sql_query); ?>')"> + <?php echo __('Drop the table (DROP)'); ?></a> + <?php echo PMA_showMySQLDocu('SQL-Syntax', 'DROP_TABLE'); ?> + </li> +<?php +} +?> +</ul> +</fieldset> +</div> +<?php +} +?> <?php if (PMA_Partition::havePartitioning()) { $partition_names = PMA_Partition::getPartitionNames($db, $table); // show the Partition maintenance section only if we detect a partition diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index b6fe2a2..75c44f3 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -651,6 +651,13 @@ a.tabcaution:hover { color: #FFFFFF; background-color: #FF0000; } +fieldset.caution a { + color: #FF0000; +} +fieldset.caution a:hover { + color: #ffffff; + background-color: #FF0000; +} <?php if ($GLOBALS['cfg']['LightTabs']) { ?> /* active tab */ diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 53f0f23..a8db826 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -626,6 +626,13 @@ a.tabcaution:hover { color: #FFFFFF; background-color: #FF0000; } +fieldset.caution a { + color: #FF0000; +} +fieldset.caution a:hover { + color: #ffffff; + background-color: #FF0000; +} <?php if ($GLOBALS['cfg']['LightTabs']) { ?> /* active tab */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-5972-ga47c6e8
by Michal Čihař 27 Jul '10

27 Jul '10

The branch, master has been updated via a47c6e8bea4fa15bf1455e6ac8413ce014a12932 (commit) from 406f7e865398a698a6034271455984f80b4e7a24 (commit) - Log ----------------------------------------------------------------- commit a47c6e8bea4fa15bf1455e6ac8413ce014a12932 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:11:18 2010 +0200 This might be called without initialized gettext. ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index c1a0b4b..d98320f 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -228,12 +228,18 @@ function PMA_fatalError($error_message, $message_args = null) } $error_message = strtr($error_message, array('<br />' => '[br]')); + if (function_exists('__')) { + $error_header = __('Error'); + } else { + $error_header = 'Error'; + } + // Displays the error message // (do not use & for parameters sent by header) $query_params = array( 'lang' => $GLOBALS['available_languages'][$GLOBALS['lang']][1], 'dir' => $GLOBALS['text_dir'], - 'type' => __('Error'), + 'type' => $error_header, 'error' => $error_message, ); header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php?' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-5971-g406f7e8
by Michal Čihař 27 Jul '10

27 Jul '10

The branch, master has been updated via 406f7e865398a698a6034271455984f80b4e7a24 (commit) via 21649938d535bf999680df8c2073d798c9e3e15e (commit) via 30cc3866e6ad69acd0c5aa8e42d44af218f78b90 (commit) via f6bba92e3e3a73cf21eb4391f40821f4ce30c44c (commit) via 187474b82901ee240eb4a9fe39226d2fe622efaa (commit) via 9b5c5dc321bf71eb78ef7b1538fe7ffa86f246db (commit) via 7033ecd338d90721951addfd1b1de616b90dd09c (commit) via ca9d6ad1fc108d715891f910881d03cf0a749ed9 (commit) via f9c6df0685c3c2cb70cce0d5ca396f3071edbfc8 (commit) via bc4dbbd8c258d7003ce361655e83c82e51216359 (commit) via 4317af25ef788f0aae1a498e1ce8b9d708f347ac (commit) via f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) from 41bc587ed4494d21e7b69647a1235d2ca405c8ea (commit) - Log ----------------------------------------------------------------- commit 406f7e865398a698a6034271455984f80b4e7a24 Merge: 21649938d535bf999680df8c2073d798c9e3e15e 30cc3866e6ad69acd0c5aa8e42d44af218f78b90 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:04:47 2010 +0200 Merge remote branch 'pootle/master' commit 21649938d535bf999680df8c2073d798c9e3e15e Merge: bc4dbbd8c258d7003ce361655e83c82e51216359 41bc587ed4494d21e7b69647a1235d2ca405c8ea Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jul 27 09:04:15 2010 +0200 Merge remote branch 'origin/master' commit 30cc3866e6ad69acd0c5aa8e42d44af218f78b90 Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 27 04:51:52 2010 +0200 Translation update done using Pootle. commit f6bba92e3e3a73cf21eb4391f40821f4ce30c44c Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 27 04:49:28 2010 +0200 Translation update done using Pootle. commit 187474b82901ee240eb4a9fe39226d2fe622efaa Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 27 04:48:48 2010 +0200 Translation update done using Pootle. commit 9b5c5dc321bf71eb78ef7b1538fe7ffa86f246db Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 27 04:34:10 2010 +0200 Translation update done using Pootle. commit 7033ecd338d90721951addfd1b1de616b90dd09c Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 27 04:31:39 2010 +0200 Translation update done using Pootle. commit ca9d6ad1fc108d715891f910881d03cf0a749ed9 Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 27 04:31:27 2010 +0200 Translation update done using Pootle. commit f9c6df0685c3c2cb70cce0d5ca396f3071edbfc8 Author: gheni <gheni(a)yahoo.cn> Date: Tue Jul 27 04:30:41 2010 +0200 Translation update done using Pootle. commit bc4dbbd8c258d7003ce361655e83c82e51216359 Merge: 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 4317af25ef788f0aae1a498e1ce8b9d708f347ac Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 18:29:49 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: po/ug.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/ug.po b/po/ug.po index 1f876d8..8595cec 100644 --- a/po/ug.po +++ b/po/ug.po @@ -7,7 +7,7 @@ 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-07-26 17:18+0200\n" -"PO-Revision-Date: 2010-07-26 05:01+0200\n" +"PO-Revision-Date: 2010-07-27 04:51+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" "Language: ug\n" @@ -93,7 +93,7 @@ msgstr "مۇشۇ قىممەتنى ئىشلىتىش" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 msgid "No blob streaming server configured!" -msgstr "" +msgstr "No blob streaming server configured!" #: bs_disp_as_mime_type.php:35 #, fuzzy @@ -103,7 +103,7 @@ msgstr "ھۆججەتنى دېسكىغا يىزىشتا خاتالىق كۆرۈل #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "URL نى ئېچىش مەغلۇب بولدى." #: db_create.php:44 #, php-format @@ -308,8 +308,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن " -"%sبۇ يەرنى كۆرۈڭ%s." +"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن %" +"sبۇ يەرنى كۆرۈڭ%s." #: db_operations.php:497 msgid "Edit PDF Pages" @@ -1510,23 +1510,23 @@ msgstr "Cookies نى قوزغاتقاندىن كېيىن ئاندىن كېرىڭ #: libraries/auth/signon.auth.lib.php:180 msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" -msgstr "" +msgstr "پارولسىز كىرىش چەكلەنگەن (پارولسىز كىرىش ئىقازىتىنى كۆرۈڭ)" #: libraries/auth/cookie.auth.lib.php:642 #: libraries/auth/signon.auth.lib.php:184 #, php-format msgid "No activity within %s seconds; please log in again" -msgstr "" +msgstr "No activity within %s seconds; please log in again" #: libraries/auth/cookie.auth.lib.php:652 #: libraries/auth/cookie.auth.lib.php:654 #: libraries/auth/signon.auth.lib.php:190 msgid "Cannot log in to the MySQL server" -msgstr "" +msgstr "MySQL مۇلازىمىتېرىغا ئۇلىنالمىدى." #: libraries/auth/http.auth.lib.php:69 msgid "Wrong username/password. Access denied." -msgstr "" +msgstr "كىرگۈزگەن ئىسلەتكۈچى ئىسمى\\پارول خاتا، زايارەت رەت قىلىندى." #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_5-8-gb404588
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, TESTING has been updated via b40458875721cefa2ee16241e7a657463452999d (commit) via f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) via 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) from 15ba6003dcfa87bacc7100c7e0409ef1d525ce68 (commit) - Log ----------------------------------------------------------------- commit b40458875721cefa2ee16241e7a657463452999d Merge: 15ba6003dcfa87bacc7100c7e0409ef1d525ce68 f3f073a0ba8fe8e3857d98a84627bda53d50dc5e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:31:37 2010 -0400 Merge branch 'MAINT_3_3_5' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- scripts/create_tables.sql | 2 +- translators.html | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b0c93f..53adf96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there @@ -20,6 +20,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator - [core] Update library PHPExcel to version 1.7.3c - bug #2994885, bug #3029168 [import] Convert Excel column name correctly +- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/Documentation.html b/Documentation.html index 9053c48..100b9ae 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.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.5 - 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.5-rc1 + 3.3.5 Documentation </h1> </div> diff --git a/README b/README index 18a6bef..279f66f 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.5-rc1 - ----------------- + Version 3.3.5 + ------------- 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 4931858..e73de8b 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.5-rc1'); + $this->set('PMA_VERSION', '3.3.5'); /** * @deprecated */ diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index bcb8b35..e4d0fc8 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` ( `username` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '', - `timevalue` timestamp(14) NOT NULL, + `timevalue` timestamp NOT NULL, `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) diff --git a/translators.html b/translators.html index 407c759..d847a9e 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.5-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.5 - 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.5-rc1 + 3.3.5 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_5, created. RELEASE_3_3_5
by Marc Delisle 26 Jul '10

26 Jul '10

The annotated tag, RELEASE_3_3_5 has been created at bf316ac3fc17da76822d65758fe315af89c9a633 (tag) tagging f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) replaces RELEASE_3_3_5RC1 tagged by Marc Delisle on Mon Jul 26 12:31:36 2010 -0400 - Log ----------------------------------------------------------------- Released 3.3.5 Marc Delisle (2): bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 3.3.5 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-11-g4317af2
by Michal Čihař 26 Jul '10

26 Jul '10

The branch, QA_3_3 has been updated via 4317af25ef788f0aae1a498e1ce8b9d708f347ac (commit) via f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) from e43fe5a8f100c772602aae71da9c529a542db493 (commit) - Log ----------------------------------------------------------------- commit 4317af25ef788f0aae1a498e1ce8b9d708f347ac Merge: e43fe5a8f100c772602aae71da9c529a542db493 f3f073a0ba8fe8e3857d98a84627bda53d50dc5e Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jul 26 18:29:37 2010 +0200 Merge branch 'MAINT_3_3_5' into QA_3_3 ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5961-g41bc587
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, master has been updated via 41bc587ed4494d21e7b69647a1235d2ca405c8ea (commit) via e43fe5a8f100c772602aae71da9c529a542db493 (commit) from 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 (commit) - Log ----------------------------------------------------------------- commit 41bc587ed4494d21e7b69647a1235d2ca405c8ea Merge: 6c3ad9e942c446abb4473b173bedf6e3d26c8ce2 e43fe5a8f100c772602aae71da9c529a542db493 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:29:48 2010 -0400 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b75e9c8..6fd14f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,7 +103,7 @@ $Id$ - bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-9-ge43fe5a
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, QA_3_3 has been updated via e43fe5a8f100c772602aae71da9c529a542db493 (commit) from 049fc7fef7548c2ba603196937c6dcaf9ff9bf00 (commit) - Log ----------------------------------------------------------------- commit e43fe5a8f100c772602aae71da9c529a542db493 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:27:30 2010 -0400 3.3.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 748e243..455c390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,7 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_5, updated. RELEASE_3_3_5RC1-2-gf3f073a
by Marc Delisle 26 Jul '10

26 Jul '10

The branch, MAINT_3_3_5 has been updated via f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit) from 58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit) - Log ----------------------------------------------------------------- commit f3f073a0ba8fe8e3857d98a84627bda53d50dc5e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jul 26 12:26:41 2010 -0400 3.3.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 555c6f2..53adf96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.5.0 (not yet released) +3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there diff --git a/Documentation.html b/Documentation.html index 9053c48..100b9ae 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.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.5 - 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.5-rc1 + 3.3.5 Documentation </h1> </div> diff --git a/README b/README index 18a6bef..279f66f 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.5-rc1 - ----------------- + Version 3.3.5 + ------------- 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 4931858..e73de8b 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.5-rc1'); + $this->set('PMA_VERSION', '3.3.5'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 407c759..d847a9e 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.5-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.5 - 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.5-rc1 + 3.3.5 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git July 2010