- Update to version 2.5.6

	Release notes are at

        http://www.phpmyadmin.net/home_page/relnotes.php?rel=0

    This release fixes the vulnerability described in:

        http://marc.theaimsgroup.com/?l=bugtraq&m=107582619125932&w=2
        http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0129

- Take maintainership

- No more support for php3

PR:		ports/64568
Submitted by:	Matthew Seaman <m.seaman@infracaninophile.co.uk>
Approved by:	mat (mentor)

1 files changed, 0 insertions, 36 deletions

diff --git a/databases/phpmyadmin211/files/fix-tbl_relation.php3 b/databases/phpmyadmin211/files/fix-tbl_relation.php3
deleted file mode 100644
index 8b52da006901..000000000000
--- a/databases/phpmyadmin211/files/fix-tbl_relation.php3
+++ /dev/null
@@ -1,36 +0,0 @@
-retrieving revision 1.38
-retrieving revision 1.39
-diff -u -r1.38 -r1.39
---- tbl_relation.php.orig	2003/09/09 08:26:43	1.38
-+++ tbl_relation.php		2003/10/21 17:08:20	1.39
-@@ -1,5 +1,5 @@
- <?php
--/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
-+/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
- // vim: expandtab sw=4 ts=4 sts=4:
- 
- /**
-@@ -280,6 +280,9 @@
-                         $selectboxall[$field_full] =  $field_v;
-                         // there could be more than one segment of the primary
-                         // so do not break
-+
-+                        // Please watch here, tbl_type is INNODB but the
-+                        // resulting value of SHOW KEYS is InnoDB
-                       
-                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
-                         $selectboxall_innodb[$field_full] =  $field_v;
-@@ -295,6 +298,13 @@
-                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
-                         $selectboxall_innodb[$field_full] =  $field_v;
-                         }
-+
-+                    // for InnoDB, any index is allowed
-+                    } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
-+                        $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
-+                        $field_v    = $curr_field['Table'] . '->' . $curr_field['Column_name'];
-+                        $selectboxall_innodb[$field_full] =  $field_v;
-+
-                     } // end if
-                 } // end while over keys
-             } // end if (mysql_num_rows)