4 Oct
2010
4 Oct
'10
7:39 p.m.
The branch, master has been updated
via 76a864be5caf24a319d5946ed4bfafe67981e54f (commit)
from 51129bc12f448883f39e863e1ad25aabed67a514 (commit)
- Log -----------------------------------------------------------------
commit 76a864be5caf24a319d5946ed4bfafe67981e54f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Mon Oct 4 12:39:20 2010 -0400
bug 3056712 Two inline edit links when browsing pma_bookmark; I removed this minor
feature of seeing a link to execute a bookmark when browsing this table
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 20 --------------------
libraries/display_tbl_links.lib.php | 2 --
2 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index c3d833d..da88087 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1118,25 +1118,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display,
$map, $analyzed_sql) {
}
} // end if (1.2.1)
- if (isset($GLOBALS['cfg']['Bookmark']['table'])
&& isset($GLOBALS['cfg']['Bookmark']['db']) &&
$table == $GLOBALS['cfg']['Bookmark']['table'] && $db ==
$GLOBALS['cfg']['Bookmark']['db'] && isset($row[1])
&& isset($row[0])) {
- $_url_params = array(
- 'db' => $row[1],
- 'id_bookmark' => $row[0],
- 'action_bookmark' => '0',
- 'action_bookmark_all' => '1',
- 'SQL' => __('Execute bookmarked query'),
- );
- $bookmark_go = '<a href="import.php'
- . PMA_generate_common_url($_url_params)
- .' " title="' . __('Execute
bookmarked query') . '">';
-
- $bookmark_go .= PMA_getIcon('b_bookmark.png', __('Execute
bookmarked query'), true);
-
- $bookmark_go .= '</a>';
- } else {
- $bookmark_go = '';
- }
-
// 1.2.2 Delete/Kill link(s)
if ($is_display['del_lnk'] == 'dr') { // delete row case
$_url_params = array(
@@ -1448,7 +1429,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display,
$map, $analyzed_sql) {
if (isset($edit_url)) {
$vertical_display['edit'][$row_no] .= ' <td
align="center" class="' . $class . ' ' . $edit_anchor_class .
'" ' . $column_style_vertical . '>' . "\n"
. PMA_linkOrButton($edit_url, $edit_str,
array(), false)
- . $bookmark_go
. ' </td>' .
"\n";
} else {
unset($vertical_display['edit'][$row_no]);
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index d261fd0..7398910 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -28,7 +28,6 @@ if ($doWriteModifyAt == 'left') {
if (!empty($edit_url)) {
echo ' <td class="' . $edit_anchor_class . '"
align="center">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
- . $bookmark_go
. ' </td>' . "\n";
}
if (!empty($del_url)) {
@@ -45,7 +44,6 @@ if ($doWriteModifyAt == 'left') {
if (!empty($edit_url)) {
echo ' <td class="' . $edit_anchor_class . '"
align="center">' . "\n"
. PMA_linkOrButton($edit_url, $edit_str, '', FALSE)
- . $bookmark_go
. ' </td>' . "\n";
}
if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
hooks/post-receive
--
phpMyAdmin