Git November 2011

git@phpmyadmin.net

7 participants
156 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23466-g1c45719
by Rouslan Placella 28 Nov '11

28 Nov '11

The branch, master has been updated via 1c457194fa42120e336da3138e76361342b0eeea (commit) from 7dddcd837ca561bd120eb16e089e31bed376797d (commit) - Log ----------------------------------------------------------------- commit 1c457194fa42120e336da3138e76361342b0eeea Author: Rouslan Placella <rouslan(a)placella.com> Date: Mon Nov 28 00:55:57 2011 +0000 XHTML fixes ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 2 +- server_privileges.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 6a7e289..5d5cca8 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -201,7 +201,7 @@ $(document).ready(function() { if ($('#fieldset_add_user a.ajax').attr('name') == 'db_specific') { /*process the fieldset_add_user attribute and get the val of privileges*/ - var url = $('#fieldset_add_user a.ajax').attr('val'); + var url = $('#fieldset_add_user a.ajax').attr('rel'); if (url.substring(url.length - 23, url.length) == "&goto=db_operations.php") { url = url.substring(0, url.length - 23); diff --git a/server_privileges.php b/server_privileges.php index dce4ce1..d653efc 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2240,7 +2240,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '</form>' . "\n"; } else { // check the privileges for a particular database. - $user_form = '<form id="usersForm"><fieldset>' . "\n" + $user_form = '<form id="usersForm" action="server_privileges.php"><fieldset>' . "\n" . '<legend>' . "\n" . PMA_getIcon('b_usrcheck.png') . ' ' . sprintf(__('Users having access to "%s"'), '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' . htmlspecialchars($checkprivs) . '</a>') . "\n" @@ -2401,7 +2401,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // Offer to create a new user for the current database $user_form .= '<fieldset id="fieldset_add_user">' . "\n" . '<legend>' . __('New') . '</legend>' . "\n" - . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1&dbname=' . htmlspecialchars($checkprivs) .'" val="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n" + . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1&dbname=' . htmlspecialchars($checkprivs) .'" rel="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n" . PMA_getIcon('b_usradd.png') . ' ' . __('Add user') . '</a>' . "\n" . '</fieldset>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23465-g7dddcd8
by Madhura Jayaratne 27 Nov '11

27 Nov '11

The branch, master has been updated via 7dddcd837ca561bd120eb16e089e31bed376797d (commit) from 301f8d981a817741a29514e4757b95ab342d279c (commit) - Log ----------------------------------------------------------------- commit 7dddcd837ca561bd120eb16e089e31bed376797d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 27 23:20:16 2011 +0530 Minor interface changes to the privileges tab in database view ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index cc17d40..dce4ce1 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2240,11 +2240,12 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '</form>' . "\n"; } else { // check the privileges for a particular database. - $user_form = '<form id="usersForm"><table id="dbspecificuserrights" class="data">' . "\n" - . '<caption class="tblHeaders">' . "\n" + $user_form = '<form id="usersForm"><fieldset>' . "\n" + . '<legend>' . "\n" . PMA_getIcon('b_usrcheck.png') . ' ' . sprintf(__('Users having access to "%s"'), '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' . htmlspecialchars($checkprivs) . '</a>') . "\n" - . '</caption>' . "\n" + . '</legend>' . "\n" + . '<table id="dbspecificuserrights" class="data">' . "\n" . '<thead>' . "\n" . ' <tr><th>' . __('User') . '</th>' . "\n" . ' <th>' . __('Host') . '</th>' . "\n" @@ -2390,7 +2391,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' </tr>' . "\n"; } $user_form .= '</tbody>' . "\n" - . '</table></form>' . "\n"; + . '</table></fieldset></form>' . "\n"; if ($GLOBALS['is_ajax_request'] == true) { $extra_data['user_form'] = $user_form; @@ -2399,6 +2400,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } else { // Offer to create a new user for the current database $user_form .= '<fieldset id="fieldset_add_user">' . "\n" + . '<legend>' . __('New') . '</legend>' . "\n" . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1&dbname=' . htmlspecialchars($checkprivs) .'" val="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n" . PMA_getIcon('b_usradd.png') . ' ' . __('Add user') . '</a>' . "\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23464-g301f8d9
by Marc Delisle 27 Nov '11

27 Nov '11

The branch, master has been updated via 301f8d981a817741a29514e4757b95ab342d279c (commit) from 3c4e231867e0ea547ad7447696bbf253a64f2899 (commit) - Log ----------------------------------------------------------------- commit 301f8d981a817741a29514e4757b95ab342d279c Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Nov 27 07:37:43 2011 -0500 Move the Cancel button next to the Save button ----------------------------------------------------------------------- Summary of changes: js/functions.js | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 2081ffc..6e92047 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1559,6 +1559,13 @@ function PMA_createTableDialog( $div, url , target) }); PMA_verifyColumnsProperties(); + + // move the Cancel button next to the Save button + var $button_pane = $('.ui-dialog-buttonpane'); + var $cancel_button = $button_pane.find('.ui-button'); + var $save_button = $('#create_table_form').find("input[name='do_save_data']"); + $cancel_button.insertAfter($save_button); + $button_pane.hide(); }, close: function() { $(window).unbind('resize.dialog-resizer'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23463-g3c4e231
by Madhura Jayaratne 27 Nov '11

27 Nov '11

The branch, master has been updated via 3c4e231867e0ea547ad7447696bbf253a64f2899 (commit) via e095e926c1462c78ff82f7e3d964dd83be5ec655 (commit) from 3dce618b7bd49c275584169882de61ce079eebdb (commit) - Log ----------------------------------------------------------------- commit 3c4e231867e0ea547ad7447696bbf253a64f2899 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 27 14:17:07 2011 +0530 A forgotten change in making JS files load dynamically. commit e095e926c1462c78ff82f7e3d964dd83be5ec655 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Nov 27 14:13:57 2011 +0530 styles for #popup_background is still needed for gis data editor ----------------------------------------------------------------------- Summary of changes: js/tbl_select.js | 7 ++++++- themes/original/css/theme_right.css.php | 15 ++++++++++++++- themes/pmahomme/css/theme_right.css.php | 15 ++++++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index faffeef..03d611a 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -173,7 +173,12 @@ $(document).ready(function() { //Token var token = $("input[name='token']").val(); - openGISEditor(value, field, type, input_name, token); + openGISEditor(); + if (!gisEditorLoaded) { + loadJSAndGISEditor(value, field, type, input_name, token); + } else { + loadGISEditor(value, field, type, input_name, token); + } }); }, 'top.frame_content'); // end $(document).ready() diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 1284ae1..2b30f3a 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1618,7 +1618,7 @@ a.close_gis_editor { display: none; position: fixed; _position: absolute; /* hack for IE */ - z-index: 101; + z-index: 1001; overflow-y: auto; overflow-x: hidden; } @@ -1645,6 +1645,19 @@ a.close_gis_editor { width: 75px; } +#popup_background { + display: none; + position: fixed; + _position: absolute; /* hack for IE6 */ + width: 100%; + height: 100%; + top: 0; + left: 0; + background: #000; + z-index: 1000; + overflow: hidden; +} + /** * ENUM/SET editor styles */ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 5d4c3f3..e47b4fd 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1999,7 +1999,7 @@ a.close_gis_editor { display: none; position: fixed; _position: absolute; /* hack for IE */ - z-index: 101; + z-index: 1001; overflow-y: auto; overflow-x: hidden; } @@ -2026,6 +2026,19 @@ a.close_gis_editor { width: 75px; } +#popup_background { + display: none; + position: fixed; + _position: absolute; /* hack for IE6 */ + width: 100%; + height: 100%; + top: 0; + left: 0; + background: #000; + z-index: 1000; + overflow: hidden; +} + /** * ENUM/SET editor styles */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23461-g3dce618
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, master has been updated via 3dce618b7bd49c275584169882de61ce079eebdb (commit) via 5e6173015709d67c40877bcf51a5c4520e83f9de (commit) from 277b6a96fa8046fe9eaaec61cee50ad675766262 (commit) - Log ----------------------------------------------------------------- commit 3dce618b7bd49c275584169882de61ce079eebdb Merge: 277b6a9 5e61730 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 26 06:54:49 2011 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.inc.php | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 430c97b..9fb4838 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown - bug #3442004 [interface] DB suggestion not correct for user with underscore +- bug #3438420 [core] Magic quotes removed in PHP 5.4 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 730cf19..ad5d613 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -69,11 +69,15 @@ if (version_compare(phpversion(), '5.3', 'lt')) { } /** - * Avoid problems with magic_quotes_runtime - * (in the future, this setting will be removed but it's not yet - * known in which PHP version) + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. */ -@ini_set('magic_quotes_runtime', false); +if (version_compare(phpversion(), '5.4', 'lt')) { + /** + * Avoid problems with magic_quotes_runtime + */ + @ini_set('magic_quotes_runtime', false); +} /** * for verification in all procedural scripts under libraries @@ -253,12 +257,18 @@ if (isset($_POST['usesubform'])) { } // end check if a subform is submitted -// remove quotes added by php -if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - PMA_arrayWalkRecursive($_GET, 'stripslashes', true); - PMA_arrayWalkRecursive($_POST, 'stripslashes', true); - PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); - PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); +/** + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.4', 'lt')) { + // remove quotes added by PHP + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + PMA_arrayWalkRecursive($_GET, 'stripslashes', true); + PMA_arrayWalkRecursive($_POST, 'stripslashes', true); + PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); + PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-47-g5e61730
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, QA_3_4 has been updated via 5e6173015709d67c40877bcf51a5c4520e83f9de (commit) from dddcddbf38729f3362b2562671b510107df72b9b (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.inc.php | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 343d6da..5355551 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown - bug #3442004 [interface] DB suggestion not correct for user with underscore +- bug #3438420 [core] Magic quotes removed in PHP 5.4 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index b695022..53eeb79 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -69,11 +69,15 @@ if (version_compare(phpversion(), '5.3', 'lt')) { } /** - * Avoid problems with magic_quotes_runtime - * (in the future, this setting will be removed but it's not yet - * known in which PHP version) + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. */ -@ini_set('magic_quotes_runtime', false); +if (version_compare(phpversion(), '5.4', 'lt')) { + /** + * Avoid problems with magic_quotes_runtime + */ + @ini_set('magic_quotes_runtime', false); +} /** * for verification in all procedural scripts under libraries @@ -253,12 +257,18 @@ if (isset($_POST['usesubform'])) { } // end check if a subform is submitted -// remove quotes added by php -if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - PMA_arrayWalkRecursive($_GET, 'stripslashes', true); - PMA_arrayWalkRecursive($_POST, 'stripslashes', true); - PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); - PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); +/** + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.4', 'lt')) { + // remove quotes added by PHP + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + PMA_arrayWalkRecursive($_GET, 'stripslashes', true); + PMA_arrayWalkRecursive($_POST, 'stripslashes', true); + PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); + PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23459-g277b6a9
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, master has been updated via 277b6a96fa8046fe9eaaec61cee50ad675766262 (commit) via dddcddbf38729f3362b2562671b510107df72b9b (commit) from bbc44c410c0ee31207821be28f57bb203749801d (commit) - Log ----------------------------------------------------------------- commit 277b6a96fa8046fe9eaaec61cee50ad675766262 Merge: bbc44c4 dddcddb Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 26 06:17:16 2011 -0500 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/check_user_privileges.lib.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4bfec6..430c97b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown +- bug #3442004 [interface] DB suggestion not correct for user with underscore 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 1de903e..daef278 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -107,8 +107,11 @@ function PMA_analyseShowGrant() && substr(PMA_DBI_getError(), 1, 4) != 1044) ) { if ($GLOBALS['cfg']['SuggestDBName']) { - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '_/', '\\1?', $show_grants_dbname); - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $GLOBALS['db_to_create']); + /** + * Do not handle the underscore wildcard + * (this case must be rare anyway) + */ + $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $show_grants_dbname); $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']); } $GLOBALS['is_create_db_priv'] = true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-46-gdddcddb
by Marc Delisle 26 Nov '11

26 Nov '11

The branch, QA_3_4 has been updated via dddcddbf38729f3362b2562671b510107df72b9b (commit) from 9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/check_user_privileges.lib.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5133a9b..343d6da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown +- bug #3442004 [interface] DB suggestion not correct for user with underscore 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 6dbc251..291213c 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -128,8 +128,11 @@ function PMA_analyseShowGrant() && substr(PMA_DBI_getError(), 1, 4) != 1044) ) { if ($GLOBALS['cfg']['SuggestDBName']) { - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '_/', '\\1?', $show_grants_dbname); - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $GLOBALS['db_to_create']); + /** + * Do not handle the underscore wildcard + * (this case must be rare anyway) + */ + $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $show_grants_dbname); $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']); } $GLOBALS['is_create_db_priv'] = true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23457-gbbc44c4
by Madhura Jayaratne 25 Nov '11

25 Nov '11

The branch, master has been updated via bbc44c410c0ee31207821be28f57bb203749801d (commit) via 9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit) via c43babad7cbde73098ded7fe502027a1af731f4b (commit) from b82662961f049474db17fc4af0f848e40c01498a (commit) - Log ----------------------------------------------------------------- commit bbc44c410c0ee31207821be28f57bb203749801d Merge: b826629 9c278d0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Nov 25 18:25:13 2011 +0530 Merge branch 'QA_3_4' Conflicts: ChangeLog Documentation.html README libraries/Config.class.php libraries/display_tbl.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c895ddb..b4bfec6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog + [interface] Improved index editor 3.4.9.0 (not yet released) +- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index e85ec3f..5b39565 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1146,13 +1146,15 @@ function PMA_buildValueDisplay($class, $condition_field, $value) * * @param string $class class of table cell * @param bool $condition_field whether to add CSS class condition + * @param object $meta the meta-information about this field + * @param string $align cell allignment * * @return string the td */ -function PMA_buildNullDisplay($class, $condition_field) +function PMA_buildNullDisplay($class, $condition_field, $meta, $align = '') { // the null class is needed for grid editing - return '<td align="right"' . ' class="' . $class . ($condition_field ? ' condition' : '') . ' null"><i>NULL</i></td>'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, '') . ' null"><i>NULL</i></td>'; } /** @@ -1546,7 +1548,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // so use the $pointer if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"'); } elseif ($row[$i] != '') { $nowrap = ' nowrap'; @@ -1569,7 +1571,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) $class = str_replace('grid_edit', '', $class); if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } else { // for blobstreaming // if valid BS reference exists @@ -1585,7 +1587,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // not binary: } else { if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { @@ -1612,7 +1614,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) $class = str_replace('grid_edit', '', $class); if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // Display as [GEOMETRY - (size)] if ('GEOM' == $_SESSION['tmp_user_values']['geometry_display']) { @@ -1681,7 +1683,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) // n o t n u m e r i c a n d n o t B L O B } else { if (! isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // support blanks in the key $relation_id = $row[$i]; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-45-g9c278d0
by Madhura Jayaratne 25 Nov '11

25 Nov '11

The branch, QA_3_4 has been updated via 9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit) from c43babad7cbde73098ded7fe502027a1af731f4b (commit) - Log ----------------------------------------------------------------- commit 9c278d020cde6ee32e830b2d0d7f11de8b59e68e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Nov 25 18:12:53 2011 +0530 bug #3442028 [edit] Inline editing enum fields with null shows no dropdown ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd66822..5133a9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 3.4.9.0 (not yet released) +- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown 3.4.8.0 (not yet released) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d73129f..32e6a0c 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -996,14 +996,16 @@ function PMA_buildValueDisplay($class, $condition_field, $value) { /** * Prepares the display for a null value * - * @param string $class - * @param string $condition_field + * @param string $class class of table cell + * @param bool $condition_field whether to add CSS class condition + * @param object $meta the meta-information about this field + * @param string $align cell allignment * * @return string the td */ -function PMA_buildNullDisplay($class, $condition_field) { +function PMA_buildNullDisplay($class, $condition_field, $meta, $align = '') { // the null class is needed for inline editing - return '<td align="right"' . ' class="' . $class . ($condition_field ? ' condition' : '') . ' null"><i>NULL</i></td>'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, '') . ' null"><i>NULL</i></td>'; } /** @@ -1359,7 +1361,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // so use the $pointer if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"'); } elseif ($row[$i] != '') { $nowrap = ' nowrap'; @@ -1382,7 +1384,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if (stristr($field_flags, 'BINARY')) { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } else { // for blobstreaming // if valid BS reference exists @@ -1398,7 +1400,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // not binary: } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { @@ -1426,7 +1428,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // support blanks in the key $relation_id = $row[$i]; 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 November 2011