The branch, master has been updated via d1a64107667a268d9d292cbb8c8d72206a080146 (commit) from 6bba56bc71b7e8ce85044578105989711a06b9fa (commit)

- Log ----------------------------------------------------------------- commit d1a64107667a268d9d292cbb8c8d72206a080146 Author: Michal Čihař mcihar@novell.com Date: Thu Feb 24 16:07:01 2011 +0100

Edit is more appropriate here

-----------------------------------------------------------------------

Summary of changes: libraries/common.lib.php | 3 ++- libraries/db_routines.inc.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php index fd5da83..c30d7d0 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2939,7 +2939,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) $response = array_merge($response, $extra_data); }

- // Set the Content-Type header to JSON so that jQuery parses the + // Set the Content-Type header to JSON so that jQuery parses the // response correctly. // // At this point, other headers might have been sent; @@ -3014,6 +3014,7 @@ function PMA_buildActionTitles() { $titles['NoDrop'] = PMA_getIcon('bd_drop.png', __('Drop'), true); $titles['Empty'] = PMA_getIcon('b_empty.png', __('Empty'), true); $titles['NoEmpty'] = PMA_getIcon('bd_empty.png', __('Empty'), true); + $titles['Edit'] = PMA_getIcon('b_edit.png', __('Edit'), true); return $titles; } ?> diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index 648d80c..d6a5b07 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -81,7 +81,7 @@ if ($routines) { ($ct%2 == 0) ? 'even' : 'odd', $sqlDropProc, $routine['ROUTINE_NAME'], - ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;db_query_force=1&amp;delimiter=' . urlencode($delimiter), $titles['Structure']) : '&nbsp;', + ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;db_query_force=1&amp;delimiter=' . urlencode($delimiter), $titles['Edit']) : '&nbsp;', '<a ' . $conditional_class . ' href="sql.php?' . $url_query . '&amp;sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>', $routine['ROUTINE_TYPE'], $routine['DTD_IDENTIFIER']);

hooks/post-receive