gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Deven Bansod 2016-12-03 09:39:13 +05:30
commit c1e073bd1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/rte/rte_list.lib.php
View File

@ -212,7 +212,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
. "AND SPECIFIC_NAME='" . $GLOBALS['dbi']->escapeString($routine['name']) . "'"
. "AND ROUTINE_TYPE='" . $GLOBALS['dbi']->escapeString($routine['type']) . "'";
$query = "SELECT `DEFINER` FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;";
$routine_definer = $GLOBALS['dbi']->fetchValue($query, 0, 0, $GLOBALS['controllink']);
$routine_definer = $GLOBALS['dbi']->fetchValue($query);
$curr_user = $GLOBALS['dbi']->getCurrentUser();
@ -248,7 +248,7 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
// otherwise we can execute it directly.
$definition = $GLOBALS['dbi']->getDefinition(
$db, $routine['type'], $routine['name'], $GLOBALS['controllink']
$db, $routine['type'], $routine['name']
);
if ($definition !== false) {
$parser = new SqlParser\Parser($definition);