gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-04-15 04:47:01 +02:00
commit 4ae2e6f6b1
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog
- bug #4851 PHP errors in login dialogue
- bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version
- bug #4845 White screen (Cloudflare)
- bug #4794 Server error viewing table content
4.4.2.0 (2015-04-13)
- bug #4835 PMA_hideShowConnection not called after submit_num_fields

18
libraries/DisplayResults.class.php
View File

@ -2418,7 +2418,8 @@ class PMA_DisplayResults
private function _buildNullDisplay($class, $condition_field, $meta, $align = '')
{
// the null class is needed for grid editing
return '<td ' . $align . ' data-decimals="' . $meta->decimals
$decimals = isset($meta->decimals) ? $meta->decimals : '-1';
return '<td ' . $align . ' data-decimals="' . $decimals
. '" data-type="' . $meta->type . '" class="'
. $this->_addClass(
$class, $condition_field, $meta, ''
@ -2496,7 +2497,7 @@ class PMA_DisplayResults
}
$mime_map = $this->__get('mime_map');
$orgFullColName = $meta->db . '.' . $meta->orgtable . '.' . $meta->orgname;
$orgFullColName = $this->__get('db') . '.' . $meta->orgtable . '.' . $meta->orgname;
if ($transformation_plugin != $default_function
|| !empty($mime_map[$orgFullColName]['input_transformation'])
) {
@ -2742,7 +2743,7 @@ class PMA_DisplayResults
++$currentColumn) {
$meta = $fields_meta[$currentColumn];
$orgFullTableName = $meta->db . '.' . $meta->orgtable;
$orgFullTableName = $this->__get('db') . '.' . $meta->orgtable;
if ($GLOBALS['cfgRelation']['commwork']
&& $GLOBALS['cfgRelation']['mimework']
@ -2751,7 +2752,7 @@ class PMA_DisplayResults
&& empty($added[$orgFullTableName])
) {
$mimeMap = array_merge(
$mimeMap, PMA_getMIME($meta->db, $meta->orgtable, false, true)
$mimeMap, PMA_getMIME($this->__get('db'), $meta->orgtable, false, true)
);
$added[$orgFullTableName] = true;
}
@ -2843,7 +2844,7 @@ class PMA_DisplayResults
$meta = $fields_meta[$i];
$orgFullColName
= $meta->db . '.' . $meta->orgtable . '.' . $meta->orgname;
= $this->__get('db') . '.' . $meta->orgtable . '.' . $meta->orgname;
$not_null_class = $meta->not_null ? 'not_null' : '';
$relation_class = isset($map[$meta->name]) ? 'relation' : '';
@ -2918,7 +2919,7 @@ class PMA_DisplayResults
// Check whether the field needs to display with syntax highlighting
$dbLower = /*overload*/mb_strtolower($meta->db);
$dbLower = /*overload*/mb_strtolower($this->__get('db'));
$tblLower = /*overload*/mb_strtolower($meta->orgtable);
$nameLower = /*overload*/mb_strtolower($meta->orgname);
if (! empty($this->transformation_info[$dbLower][$tblLower][$nameLower])
@ -2988,7 +2989,7 @@ class PMA_DisplayResults
);
$transform_url_params = array(
'db' => $meta->db,
'db' => $this->__get('db'),
'table' => $meta->orgtable,
'where_clause' => $unique_conditions[0],
'transform_key' => $meta->orgname
@ -5213,7 +5214,8 @@ class PMA_DisplayResults
$relational_display = $_SESSION['tmpval']['relational_display'];
$printview = $this->__get('printview');
$result = '<td data-decimals="' . $meta->decimals . '" data-type="'
$decimals = isset($meta->decimals) ? $meta->decimals : '-1';
$result = '<td data-decimals="' . $decimals . '" data-type="'
. $meta->type . '" class="'
. $this->_addClass(
$class, $condition_field, $meta, $nowrap,