Ticket #24049: 24049.diff

209a210,219
>       sort( $plugin_files );
>       $plugin_basedir = plugin_basename("$dir/");
>       $plugin_root_files = array();
>       foreach ( $plugin_files as $key => $value ) {
>               if ( ! preg_match( '_' . $plugin_basedir . '.+/_', $value ) ) {
>                       $plugin_root_files[] = $value;
>                       unset( $plugin_files[ $key ] );
>               }
>       }
>       $plugin_files = $plugin_root_files + $plugin_files;