Git January 2012

git@phpmyadmin.net

5 participants
135 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-11-g0b70c27
by Marc Delisle 08 Jan '12

08 Jan '12

The branch, master has been updated via 0b70c272b4db3abe290ca72d6805c56caf751a03 (commit) from 02fb282694b9d4e18915b95c93ec27f50db7f048 (commit) - Log ----------------------------------------------------------------- commit 0b70c272b4db3abe290ca72d6805c56caf751a03 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 8 08:21:20 2012 -0500 Incorrect XHTML ----------------------------------------------------------------------- Summary of changes: libraries/tbl_select.lib.php | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 967f39c..b1108fa 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -152,27 +152,18 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie } elseif ($foreignData['foreign_link'] == true) { if (isset($fields[$i]) && is_string($fields[$i])) { - $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']" value="' . $fields[$i] . '"'; - 'id="field_' . md5($field) . '[' . $i .']" - class="textfield"/>' ; + $str .= '<input type="text" id="fieldID_' . $i . '" name="fields[' . $i . ']" value="' . $fields[$i] . '" id="field_' . md5($field) . '[' . $i .']" class="textfield" />' ; } else { - $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . ']"'; - 'id="field_' . md5($field) . '[' . $i .']" - class="textfield" />' ; + $str .= '<input type="text" id="fieldID_' . $i . '" name="fields[' . $i . ']" id="field_' . md5($field) . '[' . $i .']" class="textfield" />' ; } - ?> - <?php $str .= '<script type="text/javascript">'; - // <![CDATA[ - $str .= <<<EOT + $str .= <<<EOT <a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php? EOT; - $str .= '' . PMA_generate_common_url($db, $table) . '&field=' . urlencode($field) . '&fieldkey=' . $i . '"'; - if ($in_zoom_search_edit) { - $str .= ' class="browse_foreign"'; - } - $str .= '>' . str_replace("'", "\'", $titles['Browse']) . '</a>'; - // ]] - $str .= '</script>'; + $str .= '' . PMA_generate_common_url($db, $table) . '&field=' . urlencode($field) . '&fieldkey=' . $i . '"'; + if ($in_zoom_search_edit) { + $str .= ' class="browse_foreign"'; + } + $str .= '>' . str_replace("'", "\'", $titles['Browse']) . '</a>'; } elseif (in_array($tbl_fields_type[$i], PMA_getGISDatatypes())) { // g e o m e t r y hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-10-g02fb282
by Marc Delisle 08 Jan '12

08 Jan '12

The branch, master has been updated via 02fb282694b9d4e18915b95c93ec27f50db7f048 (commit) from dcc9b2c71f0141a08a64584e2549fd12d5c60285 (commit) - Log ----------------------------------------------------------------- commit 02fb282694b9d4e18915b95c93ec27f50db7f048 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 8 07:39:20 2012 -0500 Clarify parameter name ----------------------------------------------------------------------- Summary of changes: libraries/tbl_select.lib.php | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index f660ba6..967f39c 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -129,13 +129,12 @@ function PMA_tbl_getSubTabs() * @param int $foreignMaxLimit Max limit of displaying foreign elements * @param array $fields Array of search criteria inputs * @param bool $in_fbs Whether we are in 'function based search' - * @param bool $in_edit Whether in search mode - * or edit mode (used for zoom search) + * @param bool $in_zoom_search_edit Whether we are in zoom search edit * * @return string HTML content for viewing foreing data and elements * for search criteria input. */ -function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false, $in_edit = false) +function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false, $in_zoom_search_edit = false) { $str = ''; if ($foreigners && isset($foreigners[$field]) && is_array($foreignData['disp_row'])) { @@ -168,7 +167,7 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie <a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php? EOT; $str .= '' . PMA_generate_common_url($db, $table) . '&field=' . urlencode($field) . '&fieldkey=' . $i . '"'; - if ($in_edit) { + if ($in_zoom_search_edit) { $str .= ' class="browse_foreign"'; } $str .= '>' . str_replace("'", "\'", $titles['Browse']) . '</a>'; @@ -189,7 +188,7 @@ EOT; } } elseif (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0 - || (strncasecmp($tbl_fields_type[$i], 'set', 3) == 0 && $in_edit) + || (strncasecmp($tbl_fields_type[$i], 'set', 3) == 0 && $in_zoom_search_edit) ) { // e n u m s a n d s e t s @@ -202,8 +201,8 @@ EOT; $value = explode(', ', str_replace("'", '', substr($tbl_fields_type[$i], 5, -1))); $cnt_value = count($value); - if ((strncasecmp($tbl_fields_type[$i], 'enum', 4) && ! $in_edit) - || (strncasecmp($tbl_fields_type[$i], 'set', 3) && $in_edit) + if ((strncasecmp($tbl_fields_type[$i], 'enum', 4) && ! $in_zoom_search_edit) + || (strncasecmp($tbl_fields_type[$i], 'set', 3) && $in_zoom_search_edit) ) { $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'">' . "\n"; } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-9-gdcc9b2c
by Marc Delisle 08 Jan '12

08 Jan '12

The branch, master has been updated via dcc9b2c71f0141a08a64584e2549fd12d5c60285 (commit) from 4a48e5d82541e4e5420d71da9605c2923d2fe3c7 (commit) - Log ----------------------------------------------------------------- commit dcc9b2c71f0141a08a64584e2549fd12d5c60285 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 8 07:26:06 2012 -0500 bug #3411038 Zoom search and inserting foreign values ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 6 +++++- libraries/tbl_select.lib.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index dd9979b..3eff09f 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -95,9 +95,13 @@ require_once './libraries/header_scripts.inc.php'; var $inline = window.opener.jQuery('.browse_foreign_clicked'); if ($inline.length != 0) { $inline.removeClass('browse_foreign_clicked') + // for grid editing, // puts new value in the previous element which is // a span with class curr_value - .prev().text(key); + .prev('.curr_value').text(key); + // for zoom-search editing, puts new value in the previous + // element which is an input field + $inline.prev('input[type=text]').val(key); self.close(); return false; } diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 86601d1..f660ba6 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -167,7 +167,11 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie $str .= <<<EOT <a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php? EOT; - $str .= '' . PMA_generate_common_url($db, $table) . '&field=' . urlencode($field) . '&fieldkey=' . $i . '">' . str_replace("'", "\'", $titles['Browse']) . '</a>'; + $str .= '' . PMA_generate_common_url($db, $table) . '&field=' . urlencode($field) . '&fieldkey=' . $i . '"'; + if ($in_edit) { + $str .= ' class="browse_foreign"'; + } + $str .= '>' . str_replace("'", "\'", $titles['Browse']) . '</a>'; // ]] $str .= '</script>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-8-g4a48e5d
by Marc Delisle 07 Jan '12

07 Jan '12

The branch, master has been updated via 4a48e5d82541e4e5420d71da9605c2923d2fe3c7 (commit) from d7f4b8a8d926eb4722ff1bbf4502762a4a7b0c5d (commit) - Log ----------------------------------------------------------------- commit 4a48e5d82541e4e5420d71da9605c2923d2fe3c7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 7 09:03:59 2012 -0500 Typo ----------------------------------------------------------------------- Summary of changes: gis_data_editor.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gis_data_editor.php b/gis_data_editor.php index d9db06f..6fb2436 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -51,7 +51,7 @@ $wkt = $gis_obj->generateWkt($gis_data, 0); $wkt_with_zero = $gis_obj->generateWkt($gis_data, 0, '0'); $result = "'" . $wkt . "'," . $srid; -// Gererate PNG or SVG based visualization +// Generate PNG or SVG based visualization $format = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) ? 'png' : 'svg'; $visualizationSettings = array('width' => 450, 'height' => 300, 'spatialColumn' => 'wkt'); $data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid)); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-6-g81d27b3
by Marc Delisle 07 Jan '12

07 Jan '12

The branch, master has been updated via 81d27b3593d340277400283850e2b8c8804081c9 (commit) via 02a736b4796ca583f5aa43d7f0f606f7f8554398 (commit) via 6599ce693625e779e5f4bde0a440813d52330c87 (commit) via e5323864b7517d13992ec0b5de69f3ce71403742 (commit) via 73edcc15115c0cfc2f6fd4bf6bf1e52dd926e92b (commit) from 8d5434fa98beca63fa02b12081ed302558fff050 (commit) - Log ----------------------------------------------------------------- commit 81d27b3593d340277400283850e2b8c8804081c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 7 07:38:00 2012 -0500 RetainQueryBox in setup and user prefs commit 02a736b4796ca583f5aa43d7f0f606f7f8554398 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 7 07:20:02 2012 -0500 This control has no effect when in the distinct query window commit 6599ce693625e779e5f4bde0a440813d52330c87 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 7 07:09:37 2012 -0500 Doc for RetainQueryBox commit e5323864b7517d13992ec0b5de69f3ce71403742 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 7 07:05:25 2012 -0500 Make message and field name more consistent with existing interface (query box) commit 73edcc15115c0cfc2f6fd4bf6bf1e52dd926e92b Author: Gareth Pursehouse <garethop(a)users.sourceforge.net> Date: Sat Jan 7 07:00:56 2012 -0500 patch #3303195 [interface] Checkbox to have SQL input remain ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 4 ++++ js/sql.js | 6 ++++-- libraries/config.default.php | 7 +++++++ libraries/config/messages.inc.php | 2 ++ libraries/config/setup.forms.php | 3 ++- libraries/config/user_preferences.forms.php | 3 ++- libraries/sql_query_form.lib.php | 8 ++++++++ 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5622a1..a336163 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog - bug #3461750 [edit] Sort by key generates wrong sql with limit clause - bug #3340842 [structure] Error dropping index of non-existing column - bug #3093145 [display] Page through rows returned from a view ++ patch #3303195 [interface] Checkbox to have SQL input remain 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken diff --git a/Documentation.html b/Documentation.html index 44578c4..b28c425 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1447,6 +1447,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dd>Defines whether <abbr title="structured query language">SQL</abbr> queries generated by phpMyAdmin should be displayed or not.</dd> + <dt id="cfg_RetainQueryBox">$cfg['RetainQueryBox'] boolean</dt> + <dd>Defines whether the <abbr title="structured query language">SQL</abbr> + query box should be kept displayed after its submission.</dd> + <dt id="cfg_AllowUserDropDatabase">$cfg['AllowUserDropDatabase'] boolean</dt> <dd>Defines whether normal users (non-administrator) are allowed to delete their own database or not. If set as FALSE, the link "Drop diff --git a/js/sql.js b/js/sql.js index abd0be7..a07d7e7 100644 --- a/js/sql.js +++ b/js/sql.js @@ -224,8 +224,10 @@ $(document).ready(function() { .html(data) .trigger('makegrid'); $('#togglequerybox').show(); - if ($("#togglequerybox").siblings(":visible").length > 0) { - $("#togglequerybox").trigger('click'); + if( $('#sqlqueryform input[name="retain_query_box"]').is(':checked') != true ) { + if ($("#togglequerybox").siblings(":visible").length > 0) { + $("#togglequerybox").trigger('click'); + } } PMA_init_slider(); } diff --git a/libraries/config.default.php b/libraries/config.default.php index 94005b7..eb177bb 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -639,6 +639,13 @@ $cfg['SkipLockedTables'] = false; $cfg['ShowSQL'] = true; /** + * retain SQL input on Ajax execute + * + * @global boolean $cfg['RetainQueryEditor'] + */ +$cfg['RetainQueryBox'] = false; + +/** * show a 'Drop database' link to normal users * * @global boolean $cfg['AllowUserDropDatabase'] diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index cb4b1a5..48635ea 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -470,6 +470,8 @@ $strConfigShowPhpInfo_name = __('Show phpinfo() link'); $strConfigShowServerInfo_name = __('Show detailed MySQL server information'); $strConfigShowSQL_desc = __('Defines whether SQL queries generated by phpMyAdmin should be displayed'); $strConfigShowSQL_name = __('Show SQL queries'); +$strConfigRetainQueryBox_desc = __('Defines whether the query box should stay on-screen after its submission'); +$strConfigRetainQueryBox_name = __('Retain query box'); $strConfigShowStats_desc = __('Allow to display database and table statistics (eg. space usage)'); $strConfigShowStats_name = __('Show statistics'); $strConfigShowTooltipAliasDB_desc = __('If tooltips are enabled and a database comment is set, this will flip the comment and the real name'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index d42f60d..8ffb0b2 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -152,7 +152,8 @@ $forms['Sql_queries']['Sql_queries'] = array( 'EditInWindow', //'QueryWindowWidth', // overridden in theme //'QueryWindowHeight', - 'QueryWindowDefTab'); + 'QueryWindowDefTab', + 'RetainQueryBox'); $forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array( 'Edit', 'Explain', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 44fad4b..9bc1c4c 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -69,7 +69,8 @@ $forms['Sql_queries']['Sql_queries'] = array( 'EditInWindow', //'QueryWindowWidth', // overridden in theme //'QueryWindowHeight', - 'QueryWindowDefTab'); + 'QueryWindowDefTab', + 'RetainQueryBox'); $forms['Sql_queries']['Sql_box'] = array( 'SQLQuery/Edit', 'SQLQuery/Explain', diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index c358f0b..9005f7d 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -344,6 +344,14 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter .'<label for="checkbox_show_query">' . __('Show this query here again') .'</label>' . "\n"; + if (! $is_querywindow) { + echo '<input type="checkbox" name="retain_query_box" value="1" ' + . 'id="retain_query_box" tabindex="133" ' + . ($GLOBALS['cfg']['RetainQueryBox'] === false ? '' : ' checked="checked"') + . ' />' + . '<label for="retain_query_box">' . __('Retain query box') + . '</label>'; + } echo '</div>' . "\n"; echo '<input type="submit" id="button_submit_query" name="SQL" tabindex="200" value="' . __('Go') . '" />' ."\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-1-g8d5434f
by Marc Delisle 06 Jan '12

06 Jan '12

The branch, master has been updated via 8d5434fa98beca63fa02b12081ed302558fff050 (commit) from 1a98c838e6142664d3f2d41543b08ee1ed0dada3 (commit) - Log ----------------------------------------------------------------- commit 8d5434fa98beca63fa02b12081ed302558fff050 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jan 6 07:04:23 2012 -0500 going to 3.5.0-beta1-dev ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 85d19f6..44578c4 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,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.5.0-alpha1 - Documentation</title> + <title>phpMyAdmin 3.5.0-beta1-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,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.5.0-alpha1 + 3.5.0-beta1-dev Documentation </h1> </div> diff --git a/README b/README index e722ded..c18603b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-alpha1 +Version 3.5.0-beta1-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f4a05b5..67756e4 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-alpha1'); + $this->set('PMA_VERSION', '3.5.0-beta1-dev'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25819-g1a98c83
by Marc Delisle 06 Jan '12

06 Jan '12

The branch, master has been updated via 1a98c838e6142664d3f2d41543b08ee1ed0dada3 (commit) from 87ce60251b62ba9b1e306e96f2d1abb159fc0cc5 (commit) - Log ----------------------------------------------------------------- commit 1a98c838e6142664d3f2d41543b08ee1ed0dada3 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jan 6 05:53:16 2012 -0500 3.5.0-alpha1 ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 48f9a89..85d19f6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,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.5.0-dev - Documentation</title> + <title>phpMyAdmin 3.5.0-alpha1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,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.5.0-dev + 3.5.0-alpha1 Documentation </h1> </div> diff --git a/README b/README index 8eafce0..e722ded 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-dev +Version 3.5.0-alpha1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 8364a65..f4a05b5 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-dev'); + $this->set('PMA_VERSION', '3.5.0-alpha1'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25818-g87ce602
by Madhura Jayaratne 05 Jan '12

05 Jan '12

The branch, master has been updated via 87ce60251b62ba9b1e306e96f2d1abb159fc0cc5 (commit) from 3c9ae060c69d3f4b2fcb372047a14053c277b158 (commit) - Log ----------------------------------------------------------------- commit 87ce60251b62ba9b1e306e96f2d1abb159fc0cc5 Author: Eric Krona <eric(a)krona.tm> Date: Thu Jan 5 22:36:06 2012 +0530 Fix for bug #3364150 - feedback in sql query window on insert/updates ----------------------------------------------------------------------- Summary of changes: js/sql.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/js/sql.js b/js/sql.js index dd8a65d..abd0be7 100644 --- a/js/sql.js +++ b/js/sql.js @@ -217,6 +217,7 @@ $(document).ready(function() { // if zero rows are returned from the query execution if ($zero_row_results.length > 0) { $('#sqlquery').val($zero_row_results.val()); + setQuery($('#sqlquery').val()); } else { $sqlqueryresults .show() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25816-g1f85d95
by Michal Čihař 05 Jan '12

05 Jan '12

The branch, master has been updated via 1f85d957ca8d6fc0df61be364c806218ba90ef7a (commit) from 35d5d344302439495fbd457f1f3ec6cc25edbcef (commit) - Log ----------------------------------------------------------------- commit 1f85d957ca8d6fc0df61be364c806218ba90ef7a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Jan 5 18:35:43 2012 +0900 Improved the Structure table of the snapshot ----------------------------------------------------------------------- Summary of changes: tbl_tracking.php | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tbl_tracking.php b/tbl_tracking.php index fecfa86..3f14745 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -278,8 +278,23 @@ if (isset($_REQUEST['snapshot'])) { ?> <td><?php echo htmlspecialchars($field['Type']);?></td> <td><?php echo htmlspecialchars($field['Collation']);?></td> - <td><?php echo htmlspecialchars($field['Null']);?></td> - <td><?php echo htmlspecialchars($field['Default']);?></td> + <td><?php echo (($field['Null'] == 'YES') ? __('Yes') : __('No')); ?></td> + <td><?php + if (isset($field['Default'])) { + $extracted_fieldspec = PMA_extractFieldSpec($field['Type']); + if ($extracted_fieldspec['type'] == 'bit') { + // here, $field['Default'] contains something like b'010' + echo PMA_convert_bit_default_value($field['Default']); + } else { + echo htmlspecialchars($field['Default']); + } + } else { + if ($field['Null'] == 'YES') { + echo '<i>NULL</i>'; + } else { + echo '<i>' . _pgettext('None for default', 'None') . '</i>'; + } + } ?></td> <td><?php echo htmlspecialchars($field['Extra']);?></td> <td><?php echo htmlspecialchars($field['Comment']);?></td> </tr> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25815-g35d5d34
by Michal Čihař 05 Jan '12

05 Jan '12

The branch, master has been updated via 35d5d344302439495fbd457f1f3ec6cc25edbcef (commit) via 41606d48a9829418652cbe2f5f859aa663fce9b2 (commit) via e89874ebe14fecee49f772845e9b1486f275e018 (commit) via 04298dbf2ded2ab553b39a91c726af3b685778bc (commit) from fc928ad7b6bf491b83713dfc8979cfeebf0dbd7f (commit) - Log ----------------------------------------------------------------- commit 35d5d344302439495fbd457f1f3ec6cc25edbcef Merge: e89874e 41606d4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jan 5 16:23:25 2012 +0100 Merge remote-tracking branch 'pootle/master' commit 41606d48a9829418652cbe2f5f859aa663fce9b2 Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Jan 5 16:23:16 2012 +0100 Translation update done using Pootle. commit e89874ebe14fecee49f772845e9b1486f275e018 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Jan 5 18:26:43 2012 +0900 Add missing percent commit 04298dbf2ded2ab553b39a91c726af3b685778bc Author: ProUser <stefan(a)inkopsforum.se> Date: Thu Jan 5 16:11:50 2012 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: libraries/advisory_rules.txt | 4 ++-- po/sv.po | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index f724ddf..44fb50a 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -282,7 +282,7 @@ rule 'Max % MyISAM key buffer ever used' [!PMA_DRIZZLE && key_buffer_size > 0] value < 95 MyISAM key buffer (index cache) % used is low. You may need to decrease the size of {key_buffer_size}, re-examine your tables to see if indexes have been removed, or examine queries and expectations about what indexes are being used. - max % MyISAM key buffer ever used: %s, this value should be above 95% | round(value,1) + max % MyISAM key buffer ever used: %s%, this value should be above 95% | round(value,1) # Don't fire if above rule fired - we don't need the same advice twice rule 'Percentage of MyISAM key buffer used' [!PMA_DRIZZLE && key_buffer_size > 0 && !fired('max % MyISAM key buffer ever used')] @@ -290,7 +290,7 @@ rule 'Percentage of MyISAM key buffer used' [!PMA_DRIZZLE && key_buffer_size > 0 value < 95 MyISAM key buffer (index cache) % used is low. You may need to decrease the size of {key_buffer_size}, re-examine your tables to see if indexes have been removed, or examine queries and expectations about what indexes are being used. - % MyISAM key buffer used: %s, this value should be above 95% | round(value,1) + % MyISAM key buffer used: %s%, this value should be above 95% | round(value,1) rule 'Percentage of index reads from memory' [!PMA_DRIZZLE && Key_read_requests > 0] 100 - (Key_reads / Key_read_requests * 100) diff --git a/po/sv.po b/po/sv.po index b5b23ce..d6655f8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-02 07:46-0500\n" -"PO-Revision-Date: 2011-12-24 10:39+0200\n" +"PO-Revision-Date: 2012-01-05 16:11+0200\n" "Last-Translator: ProUser <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.1.6\n" @@ -2253,15 +2253,14 @@ msgstr "Vecka" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "" +msgstr "kalender-månad-år" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "Inget" +msgstr "Ingen" #: js/messages.php:494 msgid "Hour" hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2012