diff --git a/ChangeLog b/ChangeLog index b6c208769..e45b833c9 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-12-02 Marc Delisle + * libraries/display_tbl.lib.php: the constant used to check + if the transformation function is included no longer exists + * libraries/transformations/: replaced "include" by "require_once" + 2003-11-28 Garvin Hicking * main.php: Fixed one remaining preg_match diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index f258068b0..20f8825c1 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1241,7 +1241,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) require_once('./libraries/transformations/' . $include_file); - if (defined('PMA_TRANSFORMATION_' . strtoupper($transformfunction_name)) && function_exists('PMA_transformation_' . $transformfunction_name)) { + if (function_exists('PMA_transformation_' . $transformfunction_name)) { $transform_function = 'PMA_transformation_' . $transformfunction_name; $transform_options = PMA_transformation_getOptions((isset($GLOBALS['mime_map'][$meta->name]['transformation_options']) ? $GLOBALS['mime_map'][$meta->name]['transformation_options'] : '')); $meta->mimetype = str_replace('_', '/', $GLOBALS['mime_map'][$meta->name]['mimetype']);