Merge remote branch 'origin/master'

ChangeLog

@@ -124,6 +124,7 @@
 - patch #3112792 [navi] Left panel table grouping incorrect,
   thanks to garas - garas
 - bug #3123433 [interface] Avoid double escaping of MySQL errors.
+- bug #3119874 [interface] Show integers without decimals on status page.
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc

db_qbe.php

@@ -246,7 +246,7 @@ for ($x = 0; $x < $col; $x++) {
 
     // If they have chosen all fields using the * selector,
     // then sorting is not available
-    // Robbat2 - Fix for Bug #570698
+    // Fix for Bug #570698
     if (isset($Sort[$x]) && isset($Field[$x])
      && substr($Field[$x], -2) == '.*') {
         $Sort[$x] = '';
@@ -936,7 +936,7 @@ for ($x = 0; $x < $col; $x++) {
     if (!empty($curField[$x]) && !empty($curSort[$x])) {
         // if they have chosen all fields using the * selector,
         // then sorting is not available
-        // Robbat2 - Fix for Bug #570698
+        // Fix for Bug #570698
         if (substr($curField[$x], -2) != '.*') {
             $qry_orderby  .=  $curField[$x] . ' ' . $curSort[$x];
             $last_orderby = 1;

libraries/common.inc.php

@@ -57,19 +57,24 @@ require './libraries/Error_Handler.class.php';
 $GLOBALS['error_handler'] = new PMA_Error_Handler();
 $cfg['Error_Handler']['display'] = TRUE;
 
-// at this point PMA_PHP_INT_VERSION is not yet defined
-if (version_compare(phpversion(), '6', 'lt')) {
+/*
+ * This setting was removed in PHP 5.3. But at this point PMA_PHP_INT_VERSION 
+ * is not yet defined so we use another way to find out the PHP version.
+ */
+if (version_compare(phpversion(), '5.3', 'lt')) {
     /**
      * Avoid object cloning errors
      */
     @ini_set('zend.ze1_compatibility_mode', false);
-
-    /**
-     * Avoid problems with magic_quotes_runtime
-     */
-    @ini_set('magic_quotes_runtime', false);
 }
 
+/**
+ * Avoid problems with magic_quotes_runtime
+ * (in the future, this setting will be removed but it's not yet
+ * known in which PHP version)
+ */
+@ini_set('magic_quotes_runtime', false);
+
 /**
  * for verification in all procedural scripts under libraries
  */
@@ -731,7 +736,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
     /**
      * Lookup server by name
-     * by Arnold - Helder Hosting
      * (see FAQ 4.8)
      */
     if (! empty($_REQUEST['server']) && is_string($_REQUEST['server'])
@@ -838,7 +842,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         // Based on mod_access in Apache:
         // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
         // Look at: "static int check_dir_access(request_rec *r)"
-        // Robbat2 - May 10, 2002
         if (isset($cfg['Server']['AllowDeny'])
           && isset($cfg['Server']['AllowDeny']['order'])) {
 

libraries/common.lib.php

@@ -557,8 +557,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
     }
 
     // --- Added to solve bug #641765
-    // Robbat2 - 12 January 2003, 9:46PM
-    // Revised, Robbat2 - 13 January 2003, 2:59PM
     if (!function_exists('PMA_SQP_isError') || PMA_SQP_isError()) {
         $formatted_sql = htmlspecialchars($the_query);
     } elseif (empty($the_query) || trim($the_query) == '') {
@@ -578,8 +576,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
     // username/password
     if (!empty($the_query) && !strstr($the_query, 'connect')) {
         // --- Added to solve bug #641765
-        // Robbat2 - 12 January 2003, 9:46PM
-        // Revised, Robbat2 - 13 January 2003, 2:59PM
         if (function_exists('PMA_SQP_isError') && PMA_SQP_isError()) {
             $error_msg_output .= PMA_SQP_getErrorString() . "\n";
             $error_msg_output .= '<br />' . "\n";

libraries/ip_allow_deny.lib.php

@@ -46,7 +46,7 @@ function PMA_getIp()
  * Based on IP Pattern Matcher
  * Originally by J.Adams <jna@retina.net>
  * Found on <http://www.php.net/manual/en/function.ip2long.php>
- * Modified by Robbat2 <robbat2@users.sourceforge.net>
+ * Modified for phpMyAdmin 
  *
  * Matches:
  * xxx.xxx.xxx.xxx        (exact)

libraries/sqlparser.lib.php

@@ -86,7 +86,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      *
      * @access public
      */
-    // Added, Robbat2 - 13 Janurary 2003, 2:59PM
     function PMA_SQP_resetError()
     {
         global $SQP_errorString;
@@ -101,7 +100,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      *
      * @access public
      */
-    // Added, Robbat2 - 13 Janurary 2003, 2:59PM
     function PMA_SQP_getErrorString()
     {
         global $SQP_errorString;
@@ -115,7 +113,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      *
      * @access public
      */
-    // Added, Robbat2 - 13 Janurary 2003, 2:59PM
     function PMA_SQP_isError()
     {
         global $SQP_errorString;
@@ -131,7 +128,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      * @access private
      * @scope SQL Parser internal
      */
-    // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
     function PMA_SQP_throwError($message, $sql)
     {
         global $SQP_errorString;

server_status.php

@@ -793,7 +793,7 @@ if (! empty($section['title'])) {
             if ('%' === substr($name, -1, 1)) {
                 echo PMA_formatNumber($value, 0, 2) . ' %';
             } elseif (is_numeric($value) && $value == (int) $value) {
-                echo PMA_formatNumber($value, 3, 1);
+                echo PMA_formatNumber($value, 4, 0);
             } elseif (is_numeric($value)) {
                 echo PMA_formatNumber($value, 3, 1);
             } else {

tbl_alter.php

@@ -92,7 +92,6 @@ if (isset($_REQUEST['do_save_data'])) {
     // To allow replication, we first select the db to use and then run queries
     // on this db.
     PMA_DBI_select_db($db) or PMA_mysqlDie(PMA_DBI_getError(), 'USE ' . PMA_backquote($db) . ';', '', $err_url);
-    // Optimization fix - 2 May 2001 - Robbat2
     $sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' ' . implode(', ', $changes) . $key_query;
     $result    = PMA_DBI_try_query($sql_query);