Merge remote-tracking branch 'origin/master'

phpmyadmin · Aug 5, 2012 · 23e04ae · 23e04ae
2 parents a3f1a92 + ed8cc33
commit 23e04ae
Show file tree

Hide file tree

Showing 9 changed files with 1,564 additions and 1,014 deletions.
diff --git a/db_operations.php b/db_operations.php
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
@@ -2789,6 +2789,7 @@ private function _getRowValues(
             $vertical_display = $this->__get('_vertical_display');            
 
             // Check whether the field needs to display with syntax highlighting
+
             if ($this->_isNeedToSytaxHighlight($meta->name)
                 && (trim($row[$i]) != '')
             ) {
@@ -2811,7 +2812,7 @@ private function _getRowValues(
                     '_', '/',
                     $this->sytax_highlighting_column_info[strtolower($this->__get('_db'))][strtolower($this->__get('_table'))][strtolower($meta->name)][2]
                 );
-                
+
             }
 
             // Check for the predefined fields need to show as link in schemas
@@ -3042,7 +3043,6 @@ private function _isNeedToSytaxHighlight($field) {
         return false;
     }
 
-
     /**
      * Check whether the field needs to be link
      *
@@ -3644,6 +3644,7 @@ private function _getDataCellForBlobColumns(
                 if ((PMA_strlen($column) > $GLOBALS['cfg']['LimitChars'])
                     && ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT)
                     && ! $this->_isNeedToSytaxHighlight(strtolower($meta->name))
+
                 ) {
                     $column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars'])
                         . '...';

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
@@ -319,7 +319,6 @@ static public function sGetToolTip($db, $table)
     static public function sGetStatusInfo($db, $table, $info = null,
         $force_read = false, $disable_error = false
     ) {
-
         if (! empty($_SESSION['is_multi_query'])) {
             $disable_error = true;
         }