Reverted some obfuscated RegExes. Nijel, as you where working on that: I removed the bugfixes you threw in for my faulty code because there where some issue left (for me):

The lines

$re0 = '@(^|(\\\\\\\\)+|[^\\\\])'; // non-escaped wildcards
$re1 = '@(^|[^\])(\\\)+'; // escaped wildcards

as they currently where made no sense to me, because the single [^\] should be replaced to [^\\\\] as well, doesn't it? To not seriously break more stuff I decided to revert to the previous mechanism here.

I will do more serious tests the next days and will actually work with my PMA again and I pay close attention to see if there are any issues left.

I also searched through the code to see if the setting of the array points from former while() constructs was in any way used [current(), next(), prev(), key(), end(), each()] but did find none.

1 files changed, 0 insertions, 2 deletions

diff --git a/server_collations.php b/server_collations.php
index 4ac56a716a..1edbe92d1c 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -55,8 +55,6 @@ echo '<table border="0">' . "\n"
    . '                </th>' . "\n"
    . '            </tr>' . "\n";
 
-reset($mysql_charsets);
-reset($mysql_collations);
 $i = 0;
 $table_row_count = count($mysql_charsets) + $mysql_collations_count;