From ce72213095c5baecc328b6261859f5510d941227 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 11 Jul 2014 15:45:31 -0400
Subject: [PATCH] bug #4489 Incorrect detection of privileges for routine
 creation

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog                        |  1 +
 libraries/rte/rte_footer.lib.php | 15 +++++----------
 libraries/rte/rte_list.lib.php   |  2 --
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6027e04dec..4b8a30a11d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
 - bug #4485 Sorting breaks the copy column feature
 - bug #4440 Javascript error when renaming table
 - bug #4483 'New window' link (selflink) disappears, causing Javascript error
+- bug #4489 Incorrect detection of privileges for routine creation
 
 4.2.5.0 (2014-06-26)
 - bug #4467 shell_exec() has been disabled for security reasons
diff --git a/libraries/rte/rte_footer.lib.php b/libraries/rte/rte_footer.lib.php
index 1ae765e440..9fe85f49a5 100644
--- a/libraries/rte/rte_footer.lib.php
+++ b/libraries/rte/rte_footer.lib.php
@@ -28,16 +28,11 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name)
     $retval .= "<fieldset class='left'>\n";
     $retval .= "<legend>" . _pgettext('Create new procedure', 'New') . "</legend>\n";
     $retval .= "        <div class='wrap'>\n";
-    if (PMA_Util::currentUserHasPrivilege($priv, $db)) {
-        $retval .= "            <a {$ajax_class['add']} ";
-        $retval .= "href='db_" . strtolower($name) . "s.php";
-        $retval .= "?$url_query&amp;add_item=1' onclick='$.datepicker.initialized = false;'>";
-        $retval .= PMA_Util::getIcon($icon);
-        $retval .= PMA_RTE_getWord('add') . "</a>\n";
-    } else {
-        $retval .= "            " . PMA_Util::getIcon($icon);
-        $retval .= PMA_RTE_getWord('no_create') . "\n";
-    }
+    $retval .= "            <a {$ajax_class['add']} ";
+    $retval .= "href='db_" . strtolower($name) . "s.php";
+    $retval .= "?$url_query&amp;add_item=1' onclick='$.datepicker.initialized = false;'>";
+    $retval .= PMA_Util::getIcon($icon);
+    $retval .= PMA_RTE_getWord('add') . "</a>\n";
     $retval .= "            " . PMA_Util::showMySQLDocu($docu) . "\n";
     $retval .= "        </div>\n";
     $retval .= "</fieldset>\n";
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index e6d119bffd..f491e19bdd 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -148,8 +148,6 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
     $retval .= "            </td>\n";
     $retval .= "            <td>\n";
     if ($routine['ROUTINE_DEFINITION'] !== null
-        && PMA_Util::currentUserHasPrivilege('ALTER ROUTINE', $db)
-        && PMA_Util::currentUserHasPrivilege('CREATE ROUTINE', $db)
     ) {
         $retval .= '                <a ' . $ajax_class['edit']
                                          . ' href="db_routines.php?'