Insertion of current namespace in Media Manager tree list

As the $data sort order has been fixed in search() (see "search.php"), utf8_encodeFN() must not be used in the comparison.

inc/media.php

@@ -1981,10 +1981,7 @@ function media_nstree($ns){
         while ($data[$pos]['id'] != $tmp_ns) {
             if (
                 $pos >= count($data) ||
-                (
-                    $data[$pos]['level'] <= $level+1 &&
-                    strnatcmp(utf8_encodeFN($data[$pos]['id']), utf8_encodeFN($tmp_ns)) > 0
-                )
+                ($data[$pos]['level'] <= $level+1 && intl_strcmp($data[$pos]['id'], $tmp_ns) > 0)
             ) {
                 array_splice($data, $pos, 0, array(array('level' => $level+1, 'id' => $tmp_ns, 'open' => 'true')));
                 break;

inc/sort.php

@@ -47,6 +47,8 @@ function _get_collator() {
 // lib/plugins/acl/admin.php:307
 // strcasecmp()
 // inc/Ui/Admin.php:162
+// strnatcmp()
+// inc/media.php:1986 --> 1984
 /**
  * Drop-in replacement for strcmp(), strcasecmp(), strnatcmp() and strnatcasecmp().
  * It uses a collator-based comparison, or strnatcasecmp() as a fallback.