From 498c14fc6299b07d54cd61d2430f34d62c778af3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 9 Apr 2015 11:47:59 -0400 Subject: [PATCH] Remove dead code Signed-off-by: Marc Delisle --- import.php | 2 +- libraries/bookmark.lib.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/import.php b/import.php index 0bca25d540..a6d4a5f117 100644 --- a/import.php +++ b/import.php @@ -312,7 +312,7 @@ if (! empty($_REQUEST['id_bookmark'])) { ); if (! empty($_REQUEST['bookmark_variable'])) { $import_text = PMA_Bookmark_applyVariables( - $import_text, $_REQUEST['bookmark_variable'] + $import_text ); } diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php index 54eaabdbe6..20659e5d1b 100644 --- a/libraries/bookmark.lib.php +++ b/libraries/bookmark.lib.php @@ -245,12 +245,11 @@ function PMA_Bookmark_getVariableCount($query) /** * Replace the placeholders in the bookmark query with variables * - * @param string $query bookmarked query - * @param array $variables variables to apply + * @param string $query bookmarked query * * @return string query with variables applied */ -function PMA_Bookmark_applyVariables($query, $variables) +function PMA_Bookmark_applyVariables($query) { // remove comments that encloses a variable placeholder $query = preg_replace(