From 9a36c3bd952912a15bc4bee8ca23106328805544 Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Wed, 1 Jun 2011 18:27:48 +0100
Subject: [PATCH] Got rid of global $param_datatypes from db_routines.inc.php

---
 libraries/db_routines.inc.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index 8832e4c775..1c36b5854c 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -19,7 +19,6 @@ if (! defined('PHPMYADMIN')) {
 }
 
 // Some definitions
-$param_datatypes     = getSupportedDatatypes(); // TODO: do not cache this here
 $param_directions    = array('IN', 'OUT', 'INOUT');
 $param_sqldataaccess = array('',
                                'NO SQL',
@@ -239,7 +238,7 @@ function getRoutineDefiner($parsed_query)
  */
 function getFormInputFromRoutineName($db, $name)
 {
-    global $_REQUEST, $param_directions, $param_datatypes, $param_sqldataaccess;
+    global $_REQUEST, $param_directions, $param_sqldataaccess;
 
     $retval  = array();
 
@@ -337,7 +336,7 @@ function getFormInputFromRoutineName($db, $name)
  */
 function getFormInputFromRequest()
 {
-    global $_REQUEST, $param_directions, $param_datatypes, $param_sqldataaccess;
+    global $_REQUEST, $param_directions, $param_sqldataaccess;
 
     $retval = array();
     $retval['name'] = '';
@@ -395,7 +394,7 @@ function getFormInputFromRequest()
         $temp_num_params = 0;
         $retval['param_type'] = $_REQUEST['routine_param_type'];
         foreach ($retval['param_type'] as $key => $value) {
-            if (! in_array($value, $param_datatypes, true)) {
+            if (! in_array($value, getSupportedDatatypes(), true)) {
                 $retval['param_type'][$key] = '';
             }
             $temp_num_params++;
@@ -414,7 +413,7 @@ function getFormInputFromRequest()
         }
     }
     $retval['returntype'] = '';
-    if (isset($_REQUEST['routine_returntype']) && in_array($_REQUEST['routine_returntype'], $param_datatypes, true)) {
+    if (isset($_REQUEST['routine_returntype']) && in_array($_REQUEST['routine_returntype'], getSupportedDatatypes(), true)) {
         $retval['returntype'] = $_REQUEST['routine_returntype'];
     }
     $retval['returnlength'] = '';
@@ -477,7 +476,7 @@ function getFormInputFromRequest()
  * @uses    getSupportedDatatypes()
  */
 function displayRoutineEditor($mode, $operation, $routine, $errors) {
-    global $db, $table, $url_query, $param_directions, $param_datatypes, $param_sqldataaccess;
+    global $db, $table, $url_query, $param_directions, $param_sqldataaccess;
 
     // Error handling
     $message = '';