From 802898b8edec4ae9a2fc7bb0fc375580f74132d3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 1 Jan 2006 20:49:21 +0000 Subject: [PATCH] remove some PHP3 compatibility code --- ChangeLog | 3 +++ libraries/transformations.lib.php | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4f28b321..013af27de 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2006-01-01 Marc Delisle + * libraries/transformations.lib.php: remove some PHP3 compatibility code + 2005-12-31 Marc Delisle * libraries/common.lib.php: bug #1388167, deleting a row in a table without a primary key, handle correctly is_js_confirmed diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index 47ad2a4e7..258df9bf7 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -50,19 +50,18 @@ function PMA_getAvailableMIMEtypes() { @ksort($filestack); foreach ($filestack AS $key => $file) { - if (preg_match('|^.*__.*\.inc\.php(3?)$|', trim($file), $match = array())) { + if (preg_match('|^.*__.*\.inc\.php$|', trim($file), $match = array())) { // File contains transformation functions. - $base = explode('__', str_replace('.inc.php' . $match[1], '', $file)); - + $base = explode('__', str_replace('.inc.php', '', $file)); $mimetype = str_replace('_', '/', $base[0]); $stack['mimetype'][$mimetype] = $mimetype; $stack['transformation'][] = $mimetype . ': ' . $base[1]; $stack['transformation_file'][] = $file; - } else if (preg_match('|^.*\.inc\.php(3?)$|', trim($file), $match)) { + } else if (preg_match('|^.*\.inc\.php$|', trim($file), $match)) { // File is a plain mimetype, no functions. - $base = str_replace('.inc.php' . $match[1], '', $file); + $base = str_replace('.inc.php', '', $file); if ($base != 'global') { $mimetype = str_replace('_', '/', $base);