diff options
author | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
commit | 693a2dc99bf07aeac1865d4a48ddf2589317ac7a (patch) | |
tree | 8bd926d3671dc9de0a72d4025aaa625a18ba51e1 /phpBB/develop/generate_utf_confusables.php | |
parent | b68de2323d6444b4b3685a98bbcb9500a38e45cb (diff) | |
parent | ac329275662f737f03f485107cb69412739c1afa (diff) | |
download | forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.gz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.bz2 forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.xz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.zip |
Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
Diffstat (limited to 'phpBB/develop/generate_utf_confusables.php')
-rw-r--r-- | phpBB/develop/generate_utf_confusables.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php index f79471afc6..0ffa9720c9 100644 --- a/phpBB/develop/generate_utf_confusables.php +++ b/phpBB/develop/generate_utf_confusables.php @@ -114,10 +114,14 @@ $uniarray = array( $copy = $uniarray; +/** +* @todo we need to check that the $uniarray does not reverse any of the mappings defined in the unicode definition +*/ + foreach ($array as $value) { $temp_hold = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', trim($value[2]))))); - + if (isset($copy[utf8_chr(hexdec((string)$value[1]))])) { $num = ''; |