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

oops, BLOBs always shown

Browse Source
This commit is contained in:
Marc Delisle
2008-05-21 17:05:56 +00:00
parent b9baa825c1
commit 0cefe743f9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/display_tbl.lib.php
View File

@@ -1283,7 +1283,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// b l o b // b l o b
} elseif (empty($_SESSION['userconf']['display_blob']) && stristr($meta->type, 'BLOB')) { //} elseif (! empty($_SESSION['userconf']['display_blob']) && stristr($meta->type, 'BLOB')) {
} elseif (stristr($meta->type, 'BLOB')) {
// loic1 : PMA_mysql_fetch_fields returns BLOB in place of // loic1 : PMA_mysql_fetch_fields returns BLOB in place of
// TEXT fields type so we have to ensure it's really a BLOB // TEXT fields type so we have to ensure it's really a BLOB
$field_flags = PMA_DBI_field_flags($dt_result, $i); $field_flags = PMA_DBI_field_flags($dt_result, $i);
@@ -2166,7 +2167,7 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
$result = $transform_function($result, $transform_options, $meta); $result = $transform_function($result, $transform_options, $meta);
} else { } else {
$result = $default_function($result, array(), $meta); $result = $default_function($result, array(), $meta);
if (stristr($meta->type, 'BLOB') && isset($_SESSION['userconf']['display_blob'])) { if (stristr($meta->type, 'BLOB') && ! empty($_SESSION['userconf']['display_blob'])) {
// in this case, restart from the original $content // in this case, restart from the original $content
$result = PMA_replace_binary_contents($content); $result = PMA_replace_binary_contents($content);
} }