Merge remote-tracking branch 'origin/master'

build.xml

@@ -38,6 +38,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
+              --exclude test,build,PHPExcel,tcpdf,php-gettext
               --reportfile ${basedir}/build/logs/pmd.xml" />
   </exec>
  </target>
@@ -49,13 +50,20 @@
               --exclude build
               --exclude libraries/PHPExcel
               --exclude libraries/tcpdf
+              --exclude libraries/php-gettext
               ${source}" />
   </exec>
  </target>
 
  <target name="phploc" description="Generate phploc.csv">
   <exec executable="phploc">
-   <arg line="--log-csv ${basedir}/build/logs/phploc.csv ${source}" />
+   <arg line="--log-csv ${basedir}/build/logs/phploc.csv
+              --exclude test
+              --exclude build
+              --exclude libraries/PHPExcel
+              --exclude libraries/tcpdf
+              --exclude libraries/php-gettext
+              ${source}" />
   </exec>
  </target>
 

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)