Merge remote-tracking branch 'origin/master'

build.xml

@@ -38,7 +38,7 @@
    <arg line="${source_comma_sep}
               xml
               codesize,design,naming,unusedcode
-              --exclude test,build,tcpdf,php-gettext,bfShapeFiles
+              --exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard
               --reportfile ${basedir}/build/logs/pmd.xml" />
   </exec>
  </target>
@@ -47,6 +47,7 @@
   <exec executable="phpcpd">
    <arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml
               --exclude test
+              --exclude PMAStandard
               --exclude build
               --exclude libraries/tcpdf
               --exclude libraries/php-gettext
@@ -59,6 +60,7 @@
   <exec executable="phploc">
    <arg line="--log-csv ${basedir}/build/logs/phploc.csv
               --exclude test
+              --exclude PMAStandard
               --exclude build
               --exclude libraries/tcpdf
               --exclude libraries/php-gettext
@@ -70,7 +72,7 @@
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, tcpdf directories">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*,*/bfShapeFiles/*
+              --ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*,*/bfShapeFiles/*,*/PMAStandard/*
               --report=checkstyle
               --report-file=${basedir}/build/logs/checkstyle.xml
               --standard=PMAStandard

libraries/common.lib.php

@@ -3316,7 +3316,8 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
  */
 function PMA_browseUploadFile($max_upload_size)
 {
-    if ($GLOBALS['is_upload'] && !empty($GLOBALS['cfg']['UploadDir'])) {
+    if (isset($GLOBALS['is_upload']) && $GLOBALS['is_upload']
+            && !empty($GLOBALS['cfg']['UploadDir'])) {
         echo '<label for="radio_import_file">';
     } else {
         echo '<label for="input_import_file">';

scripts/create-release.sh

@@ -132,6 +132,9 @@ echo "* Removing unneeded files"
 # if someone runs /test/wui.php and there are test failures
 rm -rf test
 
+# Remove phpcs coding standard definition
+rm -rf PMAStandard
+
 # Testsuite setup
 rm -f build.xml phpunit.xml.dist
 

test/libraries/common/PMA_extractColumnSpec_test.php

@@ -17,6 +17,12 @@ require_once 'libraries/common.lib.php';
  */
 class PMA_extractColumnSpec_test extends PHPUnit_Framework_TestCase
 {
+
+    protected function setUp()
+    {
+        $GLOBALS['cfg']['LimitChars'] = 1000;
+    }
+
     /**
      * Test case for parsing SHOW COLUMNS output
      *