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:
Michal Čihař 2016-12-14 15:58:17 +01:00
commit 2331fa0ead
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog
- issue #12800 Updated embedded phpSecLib to 2.0.4
- issue #12800 Fixed various issues with PHP 7.1
- issue #11816 Fixed operation with lower_case_table_names=2
- issue #12813 Fixed stored procedure execution
4.6.5.2 (2016-12-05)
- issue #12765 Fixed SQL export with newlines

18
libraries/rte/rte_routines.lib.php
View File

@ -568,19 +568,12 @@ function PMA_RTN_getDataFromRequest()
* @param string $type Type of routine (ROUTINE|PROCEDURE)
* @param bool $all Whether to return all data or just
* the info about parameters.
* @param bool $control Where to use Controllink to query for
* routine information
*
* @return array Data necessary to create the routine editor.
*/
function PMA_RTN_getDataFromName($name, $type, $all = true, $control = false)
function PMA_RTN_getDataFromName($name, $type, $all = true)
{
global $db;
$link = null;
if ($control) {
$link = $GLOBALS['controllink'];
}
$retval = array();
@ -594,7 +587,7 @@ function PMA_RTN_getDataFromName($name, $type, $all = true, $control = false)
. "AND ROUTINE_TYPE='" . $GLOBALS['dbi']->escapeString($type) . "'";
$query = "SELECT $fields FROM INFORMATION_SCHEMA.ROUTINES WHERE $where;";
$routine = $GLOBALS['dbi']->fetchSingleRow($query, 'ASSOC', $link);
$routine = $GLOBALS['dbi']->fetchSingleRow($query, 'ASSOC');
if (! $routine) {
return false;
@ -608,8 +601,7 @@ function PMA_RTN_getDataFromName($name, $type, $all = true, $control = false)
= $GLOBALS['dbi']->getDefinition(
$db,
$routine['ROUTINE_TYPE'],
$routine['SPECIFIC_NAME'],
$link
$routine['SPECIFIC_NAME']
);
if ($definition == NULL) {
@ -1314,7 +1306,7 @@ function PMA_RTN_handleExecute()
if (! empty($_REQUEST['execute_routine']) && ! empty($_REQUEST['item_name'])) {
// Build the queries
$routine = PMA_RTN_getDataFromName(
$_REQUEST['item_name'], $_REQUEST['item_type'], false, true
$_REQUEST['item_name'], $_REQUEST['item_type'], false
);
if ($routine === false) {
$message = __('Error in processing request:') . ' ';
@ -1510,7 +1502,7 @@ function PMA_RTN_handleExecute()
* Display the execute form for a routine.
*/
$routine = PMA_RTN_getDataFromName(
$_GET['item_name'], $_GET['item_type'], true, true
$_GET['item_name'], $_GET['item_type'], true
);
if ($routine !== false) {
$form = PMA_RTN_getExecuteForm($routine);