[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11694-g60fdffb

[Michal Čihař]

The branch, master has been updated
       via  60fdffbafaa32ba629638894f42403d34b53de20 (commit)
       via  eed246438e9d6f164d8208f0c01482d2c429e62a (commit)
       via  33df35fd6b133ecb07be107937ebf328f5de1244 (commit)
       via  896519cf77b73234ded21f8c81f95ec931bcaeac (commit)
      from  dc218032df2896d173334304e8ff673709012ea6 (commit)


- Log -----------------------------------------------------------------
commit 60fdffbafaa32ba629638894f42403d34b53de20
Merge: dc218032df2896d173334304e8ff673709012ea6 eed246438e9d6f164d8208f0c01482d2c429e62a
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Jul 22 11:56:33 2011 +0200

    Merge remote-tracking branch 'rouslan/rte'

commit eed246438e9d6f164d8208f0c01482d2c429e62a
Merge: 33df35fd6b133ecb07be107937ebf328f5de1244 49b2ca984a6c38fa7b49aeff3f1344d837cf5834
Author: Rouslan Placella <rouslan at placella.com>
Date:   Thu Jul 21 20:11:24 2011 +0100

    Merge branch 'master' into rte

commit 33df35fd6b133ecb07be107937ebf328f5de1244
Merge: 896519cf77b73234ded21f8c81f95ec931bcaeac fd121f211a805e6cb83b51f5087ac79e7791dbba
Author: Rouslan Placella <rouslan at placella.com>
Date:   Thu Jul 21 14:54:41 2011 +0100

    Merge branch 'master' into rte

commit 896519cf77b73234ded21f8c81f95ec931bcaeac
Author: Rouslan Placella <rouslan at placella.com>
Date:   Thu Jul 21 14:52:30 2011 +0100

    E_ALL fix

-----------------------------------------------------------------------

Summary of changes:
 libraries/rte/rte_routines.lib.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 9a99b8c..2edb4ca 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -1356,6 +1356,8 @@ function PMA_RTN_getExecuteForm($routine)
     }
     $retval .= "<th>" . __('Value')    . "</th>\n";
     $retval .= "</tr>\n";
+    // Get a list of data types that are not yet supported.
+    $no_support_types = PMA_unsupportedDatatypes();
     for ($i=0; $i<$routine['item_num_params']; $i++) { // Each parameter
         if ($routine['item_type'] == 'PROCEDURE'
             && $routine['item_param_dir'][$i] == 'OUT'
@@ -1368,8 +1370,6 @@ function PMA_RTN_getExecuteForm($routine)
         $retval .= "<td>{$routine['item_param_type'][$i]}</td>\n";
         if ($cfg['ShowFunctionFields']) {
             $retval .= "<td>\n";
-            // Get a list of data types that are not yet supported.
-            $no_support_types = PMA_unsupportedDatatypes();
             if (stristr($routine['item_param_type'][$i], 'enum')
                 || stristr($routine['item_param_type'][$i], 'set')
                 || in_array(strtolower($routine['item_param_type'][$i]), $no_support_types)


hooks/post-receive
-- 
phpMyAdmin