diff --git a/mod/wiki/db/migration/lib.php b/mod/wiki/db/migration/lib.php
index 63aaa4cd7e6..b65a3d5304d 100644
--- a/mod/wiki/db/migration/lib.php
+++ b/mod/wiki/db/migration/lib.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * convert ewiki format text to html format
+ *
+ * @param object $oldentry wiki entry object
+ * @param object $oldpage wiki page object
+ * @param object $oldwiki wiki instance object
+ * @return string html format wiki content
+ */
 function wiki_ewiki_2_html($oldentry, $oldpage, $oldwiki) {
     global $CFG, $wiki_entry, $moodle_disable_camel_case, $ewiki_plugins, $ewiki_config, $moodle_format;
 
@@ -6,7 +14,7 @@ function wiki_ewiki_2_html($oldentry, $oldpage, $oldwiki) {
 
     $moodle_disable_camel_case = ($oldwiki->disablecamelcase == 1);
 
-        // Block of dinamic ewiki defines
+    // Block of dinamic ewiki defines
     wiki_set_define("EWIKI_NAME", $wiki_entry->pagename);
     wiki_set_define("EWIKI_DEFAULT_LANG", current_language());
     if ($moodle_disable_camel_case) {
@@ -48,8 +56,7 @@ function wiki_ewiki_2_html($oldentry, $oldpage, $oldwiki) {
 
     $content = ewiki_format($oldpage->content);
 
-    return format_text($content, $moodle_format);
-
+    return $content;
 }
 
 function wiki_set_define($key, $value) {
@@ -64,3 +71,512 @@ function wiki_get_define($key) {
     return $ewikidefines[$key];
 }
 
+function ewiki_mime_magic($binary_data) {
+    $mime_magic_data = array(
+        array(0, 2, 0, "\x06\x02", "application/x-alan-adventure-game"),
+        array(0, 4, 0, "TADS", "application/x-tads-game"),
+        array(0, 2, 0, "\x01\x10", "application/x-executable-file"),
+        array(0, 2, 0, "\x01\x11", "application/x-executable-file"),
+        array(0, 2, 0, "\x01ƒ", "application/x-executable-file"),
+        array(0, 5, 0, "Core\001", "application/x-executable-file"),
+        array(0, 22, 0, "AMANDA: TAPESTART DATE", "application/x-amanda-header"),
+        array(0, 2, 0xfff0, 0xf0ff, "audio/mpeg"),
+        array(4, 2, 0, "¯\x11", "video/fli"),
+        array(4, 2, 0, "¯\x12", "video/flc"),
+        array(0, 4, 0, "MOVI", "video/x-sgi-movie"),
+        array(4, 4, 0, "moov", "video/quicktime"),
+        array(4, 4, 0, "mdat", "video/quicktime"),
+        array(0, 18, 0, "FiLeStArTfIlEsTaRt", "text/x-apple-binscii"),
+        array(0, 3, 0, "\x0aGL", "application/data"),
+        array(0, 2, 0, "\x76\xff", "application/data"),
+        array(0, 6, 0, "NuFile", "application/data"),
+        array(0, 6, 0, "N\xf5F\xe9l\xe5", "application/data"),
+        array(0, 4, 0, "\x00\x16\x05\x00", "application/data"),
+        array(0, 4, 0, "\x07\x16\x05\x00", "application/data"),
+        array(257, 6, 0, "ustar\0", "application/x-tar"),
+        array(257, 8, 0, "ustar\040\040\0", "application/x-gtar"),
+        array(0, 2, 0, "qÇ", "application/x-cpio"),
+        array(0, 2, 0, "Çq", "application/x-bcpio"),
+        array(0, 6, 0, "070707", "application/x-cpio"),
+        array(0, 6, 0, "070701", "application/x-cpio"),
+        array(0, 6, 0, "070702", "application/x-cpio"),
+        array(0, 2, 0, "ÿm", "application/data"),
+        array(0, 2, 0, "ÿe", "application/data"),
+        array(0, 5, 0, "=<ar>", "application/x-ar"),
+        array(0, 19, 0, "!<arch>\n__________E", "application/x-ar"),
+        array(0, 3, 0, "-h-", "application/data"),
+        array(0, 7, 0, "!<arch>", "application/x-ar"),
+        array(0, 4, 0, "<ar>", "application/x-ar"),
+        array(0, 4, 0, ">ra<", "application/x-ar"),
+        array(0, 4, 0, "!<ar", "application/x-ar"),
+        array(0, 4, 0, "\x00\x03ݒ", "application/data"),
+        array(0, 4, 0, "\x00\x03ݔ", "application/data"),
+        array(0, 4, 0x8080ffff, 0x81a, "application/x-arc"),
+        array(0, 4, 0x8080ffff, 0x91a, "application/x-arc"),
+        array(0, 4, 0x8080ffff, 0x21a, "application/x-arc"),
+        array(0, 4, 0x8080ffff, 0x31a, "application/x-arc"),
+        array(0, 4, 0x8080ffff, 0x41a, "application/x-arc"),
+        array(0, 4, 0x8080ffff, 0x61a, "application/x-arc"),
+        array(0, 8, 0, "\032archive", "application/data"),
+        array(0, 2, 0, "ê`", "application/x-arj"),
+        array(0, 4, 0, "HPAK", "application/data"),
+        array(0, 8, 0, "\351,\001JAM\   ", "application/data"),
+        array(2, 5, 0, "-lh0-", "application/x-lha"),
+        array(2, 5, 0, "-lh1-", "application/x-lha"),
+        array(2, 5, 0, "-lz4-", "application/x-lha"),
+        array(2, 5, 0, "-lz5-", "application/x-lha"),
+        array(2, 5, 0, "-lzs-", "application/x-lha"),
+        array(2, 5, 0, "-lh\40-", "application/x-lha"),
+        array(2, 5, 0, "-lhd-", "application/x-lha"),
+        array(2, 5, 0, "-lh2-", "application/x-lha"),
+        array(2, 5, 0, "-lh3-", "application/x-lha"),
+        array(2, 5, 0, "-lh4-", "application/x-lha"),
+        array(2, 5, 0, "-lh5-", "application/x-lha"),
+        array(0, 4, 0, "Rar!", "application/x-rar"),
+        array(0, 4, 0, "SQSH", "application/data"),
+        array(0, 4, 0, "UC2\x1a", "application/data"),
+        array(0, 4, 0, "PK\003\004", "application/zip"),
+        array(20, 4, 0, "ýħÜ", "application/x-zoo"),
+        array(10, 25, 0, "# This is a shell archive", "application/x-shar"),
+        array(0, 4, 0, "*STA", "application/data"),
+        array(0, 4, 0, "2278", "application/data"),
+        array(0, 2, 0, "p\x01", "application/x-executable-file"),
+        array(0, 2, 0, "q\x01", "application/x-executable-file"),
+        array(0, 5, 0, "\000\004\036\212\200", "application/core"),
+        array(0, 4, 0, ".snd", "audio/basic"),
+        array(0, 4, 0, "\x00ds.", "audio/basic"),
+        array(0, 4, 0, "MThd", "audio/midi"),
+        array(0, 4, 0, "CTMF", "audio/x-cmf"),
+        array(0, 3, 0, "SBI", "audio/x-sbi"),
+        array(0, 19, 0, "Creative Voice File", "audio/x-voc"),
+        array(0, 4, 0, "KRTN", "audio/x-multitrack"),
+        array(0, 4, 0, "RIFF", "audio/x-wav"),
+        array(0, 4, 0, "EMOD", "audio/x-emod"),
+        array(0, 4, 0, "ýar.", "audio/x-pn-realaudio"),
+        array(0, 3, 0, "MTM", "audio/x-multitrack"),
+        array(0, 2, 0, "if", "audio/x-669-mod"),
+        array(0, 3, 0, "FAR", "audio/mod"),
+        array(0, 5, 0, "MAS_U", "audio/x-multimate-mod"),
+        array(0x2c, 4, 0, "SCRM", "audio/x-st3-mod"),
+        array(0, 22, 0, "GF1PATCH110\0ID#000002\0", "audio/x-gus-patch"),
+        array(0, 22, 0, "GF1PATCH100\0ID#000002\0", "audio/x-gus-patch"),
+        array(0, 2, 0, "JN", "audio/x-669-mod"),
+        array(0, 4, 0, "UN05", "audio/x-mikmod-uni"),
+        array(21, 8, 0, "!SCREAM!", "audio/x-st2-mod"),
+        array(1080, 4, 0, "M.K.", "audio/x-protracker-mod"),
+        array(1080, 4, 0, "M!K!", "audio/x-protracker-mod"),
+        array(1080, 4, 0, "FLT4", "audio/x-startracker-mod"),
+        array(1080, 4, 0, "4CHN", "audio/x-fasttracker-mod"),
+        array(1080, 4, 0, "6CHN", "audio/x-fasttracker-mod"),
+        array(1080, 4, 0, "8CHN", "audio/x-fasttracker-mod"),
+        array(1080, 4, 0, "CD81", "audio/x-oktalyzer-mod"),
+        array(1080, 4, 0, "OKTA", "audio/x-oktalyzer-mod"),
+        array(1080, 4, 0, "16CN", "audio/x-taketracker-mod"),
+        array(1080, 4, 0, "32CN", "audio/x-taketracker-mod"),
+        array(0, 3, 0, "TOC", "audio/x-toc"),
+        array(0, 2, 0, "\x07\x01", "application/x-executable-file"),
+        array(0, 2, 0, "\x01\x06", "application/x-executable-file"),
+        array(0, 2, 0, "\x06\x01", "application/x-executable-file"),
+        array(0, 2, 0, "//", "text/cpp"),
+        array(0, 5, 0, "\\1cw ", "application/data"),
+        array(0, 4, 0, "\\1cw", "application/data"),
+        array(0, 4, 0xffffff00, 0x140185, "application/data"),
+        array(0, 4, 0xffffff00, 0xcb0185, "application/data"),
+        array(0, 2, 0, "\x01}", "application/x-executable-file"),
+        array(0, 2, 0, "\x01", "application/x-executable-file"),
+        array(4, 4, 0, "pipe", "application/data"),
+        array(4, 4, 0, "prof", "application/data"),
+        array(0, 9, 0, "#!/bin/sh", "application/x-sh"),
+        array(0, 10, 0, "#! /bin/sh", "application/x-sh"),
+        array(0, 11, 0, "#!\   /bin/sh", "application/x-sh"),
+        array(0, 10, 0, "#!/bin/csh", "application/x-csh"),
+        array(0, 11, 0, "#! /bin/csh", "application/x-csh"),
+        array(0, 12, 0, "#!\   /bin/csh", "application/x-csh"),
+        array(0, 10, 0, "#!/bin/ksh", "application/x-ksh"),
+        array(0, 11, 0, "#! /bin/ksh", "application/x-ksh"),
+        array(0, 12, 0, "#!\   /bin/ksh", "application/x-ksh"),
+        array(0, 17, 0, "#!/usr/local/tcsh", "application/x-csh"),
+        array(0, 21, 0, "#!/usr/local/bin/tcsh", "application/x-csh"),
+        array(0, 22, 0, "#! /usr/local/bin/tcsh", "application/x-csh"),
+        array(0, 23, 0, "#!\   /usr/local/bin/tcsh", "application/x-csh"),
+        array(0, 20, 0, "#!/usr/local/bin/zsh", "application/x-zsh"),
+        array(0, 21, 0, "#! /usr/local/bin/zsh", "application/x-zsh"),
+        array(0, 22, 0, "#!\   /usr/local/bin/zsh", "application/x-zsh"),
+        array(0, 20, 0, "#!/usr/local/bin/ash", "application/x-sh"),
+        array(0, 21, 0, "#! /usr/local/bin/ash", "application/x-zsh"),
+        array(0, 22, 0, "#!\   /usr/local/bin/ash", "application/x-zsh"),
+        array(0, 19, 0, "#!/usr/local/bin/ae", "text/script"),
+        array(0, 20, 0, "#! /usr/local/bin/ae", "text/script"),
+        array(0, 21, 0, "#!\   /usr/local/bin/ae", "text/script"),
+        array(0, 11, 0, "#!/bin/nawk", "application/x-awk"),
+        array(0, 12, 0, "#! /bin/nawk", "application/x-awk"),
+        array(0, 13, 0, "#!\   /bin/nawk", "application/x-awk"),
+        array(0, 15, 0, "#!/usr/bin/nawk", "application/x-awk"),
+        array(0, 16, 0, "#! /usr/bin/nawk", "application/x-awk"),
+        array(0, 17, 0, "#!\   /usr/bin/nawk", "application/x-awk"),
+        array(0, 21, 0, "#!/usr/local/bin/nawk", "application/x-awk"),
+        array(0, 22, 0, "#! /usr/local/bin/nawk", "application/x-awk"),
+        array(0, 23, 0, "#!\   /usr/local/bin/nawk", "application/x-awk"),
+        array(0, 11, 0, "#!/bin/gawk", "application/x-awk"),
+        array(0, 12, 0, "#! /bin/gawk", "application/x-awk"),
+        array(0, 13, 0, "#!\   /bin/gawk", "application/x-awk"),
+        array(0, 15, 0, "#!/usr/bin/gawk", "application/x-awk"),
+        array(0, 16, 0, "#! /usr/bin/gawk", "application/x-awk"),
+        array(0, 17, 0, "#!\   /usr/bin/gawk", "application/x-awk"),
+        array(0, 21, 0, "#!/usr/local/bin/gawk", "application/x-awk"),
+        array(0, 22, 0, "#! /usr/local/bin/gawk", "application/x-awk"),
+        array(0, 23, 0, "#!\   /usr/local/bin/gawk", "application/x-awk"),
+        array(0, 10, 0, "#!/bin/awk", "application/x-awk"),
+        array(0, 11, 0, "#! /bin/awk", "application/x-awk"),
+        array(0, 12, 0, "#!\   /bin/awk", "application/x-awk"),
+        array(0, 14, 0, "#!/usr/bin/awk", "application/x-awk"),
+        array(0, 15, 0, "#! /usr/bin/awk", "application/x-awk"),
+        array(0, 16, 0, "#!\   /usr/bin/awk", "application/x-awk"),
+        array(0, 5, 0, "BEGIN", "application/x-awk"),
+        array(0, 11, 0, "#!/bin/perl", "application/x-perl"),
+        array(0, 12, 0, "#! /bin/perl", "application/x-perl"),
+        array(0, 13, 0, "#!\   /bin/perl", "application/x-perl"),
+        array(0, 20, 0, "eval \"exec /bin/perl", "application/x-perl"),
+        array(0, 15, 0, "#!/usr/bin/perl", "application/x-perl"),
+        array(0, 16, 0, "#! /usr/bin/perl", "application/x-perl"),
+        array(0, 17, 0, "#!\   /usr/bin/perl", "application/x-perl"),
+        array(0, 24, 0, "eval \"exec /usr/bin/perl", "application/x-perl"),
+        array(0, 21, 0, "#!/usr/local/bin/perl", "application/x-perl"),
+        array(0, 22, 0, "#! /usr/local/bin/perl", "application/x-perl"),
+        array(0, 23, 0, "#!\   /usr/local/bin/perl", "application/x-perl"),
+        array(0, 30, 0, "eval \"exec /usr/local/bin/perl", "application/x-perl"),
+        array(0, 9, 0, "#!/bin/rc", "text/script"),
+        array(0, 10, 0, "#! /bin/rc", "text/script"),
+        array(0, 11, 0, "#!\   /bin/rc", "text/script"),
+        array(0, 11, 0, "#!/bin/bash", "application/x-sh"),
+        array(0, 12, 0, "#! /bin/bash", "application/x-sh"),
+        array(0, 13, 0, "#!\   /bin/bash", "application/x-sh"),
+        array(0, 21, 0, "#!/usr/local/bin/bash", "application/x-sh"),
+        array(0, 22, 0, "#! /usr/local/bin/bash", "application/x-sh"),
+        array(0, 23, 0, "#!\   /usr/local/bin/bash", "application/x-sh"),
+        array(0, 4, 0, "#! /", "text/script"),
+        array(0, 5, 0, "#!\   /", "text/script"),
+        array(0, 3, 0, "#!/", "text/script"),
+        array(0, 3, 0, "#! ", "text/script"),
+        array(0, 2, 0, "\037\235", "application/compress"),
+        array(0, 2, 0, "\037\213", "application/x-gzip"),
+        array(0, 2, 0, "\037\036", "application/data"),
+        array(0, 2, 0, "\x1f\x1f", "application/data"),
+        array(0, 2, 0, "\x1fÿ", "application/data"),
+        array(0, 2, 0, "\377\037", "application/data"),
+        array(0, 2, 0, "Ë\x05", "application/data"),
+        array(0, 3, 0, "BZh", "application/x-bzip2"),
+        array(0, 2, 0, "ÿv", "application/data"),
+        array(0, 2, 0, "þv", "application/data"),
+        array(0, 2, 0, "ýv", "application/x-lzh"),
+        array(0, 2, 0, "\037\237", "application/data"),
+        array(0, 2, 0, "\037\236", "application/data"),
+        array(0, 2, 0, "\037\240", "application/data"),
+        array(0, 2, 0, "BZ", "application/x-bzip"),
+        array(0, 9, 0, "\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a", "application/data"),
+        array(0, 4, 0, "W\x12\x01\x00", "application/core"),
+        array(0, 4, 0, "ΚW\x13", "application/x-gdbm"),
+        array(0, 4, 0, "\x13WšÎ", "application/x-gdbm"),
+        array(0, 4, 0, "GDBM", "application/x-gdbm"),
+        array(0, 4, 0, "a\x15\x06\x00", "application/x-db"),
+        array(0, 4, 0, "b1\x05\x00", "application/x-db"),
+        array(0, 23, 0, "=<list>\n<protocol bbn-m", "application/data"),
+        array(0, 5, 0, "diff ", "text/x-patch"),
+        array(0, 4, 0, "*** ", "text/x-patch"),
+        array(0, 8, 0, "Only in ", "text/x-patch"),
+        array(0, 23, 0, "Common subdirectories: ", "text/x-patch"),
+        array(0, 19, 0, "!<arch>\n________64E", "application/data"),
+        array(0, 2, 0, "\x01ˆ", "application/x-executable-file"),
+        array(0, 2, 0, "\x01", "application/x-object-file"),
+        array(0, 3, 0, "\377\377\177", "application/data"),
+        array(0, 3, 0, "\377\377\174", "application/data"),
+        array(0, 3, 0, "\377\377\176", "application/data"),
+        array(0, 3, 0, "\033c\033", "application/data"),
+        array(0, 4, 0, "\x00\x12և", "image/x11"),
+        array(0, 8, 0, "!<PDF>!\n", "application/x-prof"),
+        array(0, 2, 0, "\x05\x01", "application/x-locale"),
+        array(0, 4, 0, "\177ELF", "application/x-executable-file"),
+        array(0, 2, 0, "\x01T", "application/data"),
+        array(0, 2, 0, "\x01U", "application/x-executable-file"),
+        array(0x438, 2, 0, "ïS", "application/x-linux-ext2fs"),
+        array(0, 4, 0, "\366\366\366\366", "application/x-pc-floppy"),
+        array(0774, 2, 0, "¾Ú", "application/data"),
+        array(0x1FE, 2, 0, "ªU", "application/data"),
+        array(0x410, 2, 0, "\x13", "application/x-filesystem"),
+        array(0x410, 2, 0, "\x13", "application/x-filesystem"),
+        array(0x410, 2, 0, "\x24h", "application/x-filesystem"),
+        array(0x410, 2, 0, "\x24x", "application/x-filesystem"),
+        array(0, 9, 0, "-rom1fs-\0", "application/x-filesystem"),
+        array(0, 4, 0, "\x1b\x03\x136", "application/x-bootable"),
+        array(0x18b, 4, 0, "OS/2", "application/x-bootable"),
+        array(0, 4, 0, "FONT", "font/x-vfont"),
+        array(0, 2, 0, "\x01\x1e", "font/x-vfont"),
+        array(0, 2, 0, "\x1e\x01", "font/x-vfont"),
+        array(0, 18, 0, "%!PS-AdobeFont-1.0", "font/type1"),
+        array(6, 18, 0, "%!PS-AdobeFont-1.0", "font/type1"),
+        array(0, 10, 0, "STARTFONT\040", "font/x-bdf"),
+        array(0, 4, 0, "\001fcp", "font/x-pcf"),
+        array(0, 5, 0, "D1.0\015", "font/x-speedo"),
+        array(0, 3, 0, "flf", "font/x-figlet"),
+        array(0, 3, 0, "flc", "application/x-font"),
+        array(0, 4, 0, "\x19Y\x02\x14", "font/x-libgrx"),
+        array(0, 4, 0, "NOFÿ", "font/x-dos"),
+        array(7, 4, 0, "AGE\x00", "font/x-dos"),
+        array(7, 4, 0, "DIV\x00", "font/x-dos"),
+        array(0, 10, 0, "<MakerFile", "application/x-framemaker"),
+        array(0, 8, 0, "<MIFFile", "application/x-framemaker"),
+        array(0, 16, 0, "<MakerDictionary", "application/x-framemaker"),
+        array(0, 16, 0, "<MakerScreenFont", "font/x-framemaker"),
+        array(0, 4, 0, "<MML", "application/x-framemaker"),
+        array(0, 9, 0, "<BookFile", "application/x-framemaker"),
+        array(0, 6, 0, "<Maker", "application/x-framemaker"),
+        array(0, 4, 0377777777, 0x860107, "application/x-executable-file"),
+        array(0, 4, 0377777777, 0x860108, "application/x-executable-file"),
+        array(0, 4, 0377777777, 0x86010b, "application/x-executable-file"),
+        array(0, 4, 0377777777, 0x8600cc, "application/x-executable-file"),
+        array(7, 22, 0, "\357\020\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", "application/core"),
+        array(0, 4, 0, "LDHi", "application/data"),
+        array(0, 13, 0, "GIMP Gradient", "application/x-gimp-gradient"),
+        array(0, 8, 0, "gimp xcf", "application/x-gimp-image"),
+        array(20, 4, 0, "GPAT", "application/x-gimp-pattern"),
+        array(20, 4, 0, "GIMP", "application/x-gimp-brush"),
+        array(0, 4, 0, "\336\22\4\225", "application/x-locale"),
+        array(0, 4, 0, "\225\4\22\336", "application/x-locale"),
+        array(0, 2, 0, "—\x01", "application/x-executable-file"),
+        array(0, 2, 0, "”\x01", "application/x-executable-file"),
+        array(0, 5, 0, "\000\001\000\000\000", "font/ttf"),
+        array(0, 4, 0, "\x0a\x0f\x08\x0e", "application/data"),
+        array(0, 4, 0, "\x0f\x0a\x0e\x08", "application/data"),
+        array(0, 4, 0, "\x08\x0e\x0a\x0f", "application/data"),
+        array(0, 4, 0, "\x0e\x08\x0f\x0a", "application/data"),
+        array(0, 4, 0, "\x06\x01\x10\x02", "application/x-object-file"),
+        array(0, 4, 0, "\x07\x01\x10\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x08\x01\x10\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0b\x01\x10\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0e\x01\x10\x02", "application/x-library-file"),
+        array(0, 4, 0, "\x0d\x01\x10\x02", "application/x-library-file"),
+        array(0, 4, 0, "\x06\x01\x14\x02", "application/x-object-file"),
+        array(0, 4, 0, "\x07\x01\x14\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x08\x01\x14\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0b\x01\x14\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0e\x01\x14\x02", "application/x-library-file"),
+        array(0, 4, 0, "\x0d\x01\x14\x02", "application/x-object-file"),
+        array(0, 4, 0, "\x06\x01\x0b\x02", "application/x-object-file"),
+        array(0, 4, 0, "\x07\x01\x0b\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x08\x01\x0b\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0b\x01\x0b\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0e\x01\x0b\x02", "application/x-library-file"),
+        array(0, 4, 0, "\x0d\x01\x0b\x02", "application/x-library-file"),
+        array(0, 4, 0, "ra<!", "application/x-ar"),
+        array(0, 4, 0, "\x02\x08\x01\x06", "application/x-executable-file"),
+        array(0, 4, 0, "\x02\x08\x01\x07", "application/x-executable-file"),
+        array(0, 4, 0, "\x02\x08\x01\x08", "application/x-executable-file"),
+        array(0, 4, 0, "\x08\x01\x0c\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x07\x01\x0c\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0b\x01\x0c\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x06\x01\x0c\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x08\x01\x0a\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x07\x01\x0a\x02", "application/x-executable-file"),
+        array(0, 4, 0, "\x0e\x01\x0c\x02", "application/x-library-file"),
+        array(0, 4, 0, "\x0d\x01\x0c\x02", "application/x-library-file"),
+        array(0, 4, 0, "\x02\x0aÿe", "application/x-library-file"),
+        array(0, 4, 0, "\x02\x0cÿe", "application/x-library-file"),
+        array(0, 4, 0, "\x02\x08ÿe", "application/x-library-file"),
+        array(0, 4, 0, "\x01X!¦", "application/core"),
+        array(0, 4, 0, "M§îè", "font/x-hp-windows"),
+        array(0, 10, 0, "Bitmapfile", "image/unknown"),
+        array(0, 4, 0, "\x02\x0c\x01\x0c", "application/x-lisp"),
+        array(0, 8, 0, "msgcat01", "application/x-locale"),
+        array(0, 2, 0, "P1", "image/x-portable-bitmap"),
+        array(0, 2, 0, "P2", "image/x-portable-graymap"),
+        array(0, 2, 0, "P3", "image/x-portable-pixmap"),
+        array(0, 2, 0, "P4", "image/x-portable-bitmap"),
+        array(0, 2, 0, "P5", "image/x-portable-graymap"),
+        array(0, 2, 0, "P6", "image/x-portable-pixmap"),
+        array(0, 4, 0, "IIN1", "image/tiff"),
+        array(0, 4, 0, "MM\x00\x2a", "image/tiff"),
+        array(0, 4, 0, "II\x2a\x00", "image/tiff"),
+        array(0, 4, 0, "\x89PNG", "image/x-png"),
+        array(1, 3, 0, "PNG", "image/x-png"),
+        array(0, 4, 0, "GIF8", "image/gif"),
+        array(0, 4, 0, "\361\0\100\273", "image/x-cmu-raster"),
+        array(0, 2, 0, "Øÿ", "image/jpeg"),
+        array(0, 4, 0, "hsi1", "image/x-jpeg-proprietary"),
+        array(0, 2, 0, "BM", "image/x-bmp"),
+        array(0, 2, 0, "IC", "image/x-ico"),
+        array(0, 4, 0, "•j¦Y", "x/x-image-sun-raster"),
+        array(0, 2, 0, "Ú\x01", "x/x-image-sgi"),
+        array(2048, 7, 0, "PCD_IPI", "x/x-photo-cd-pack-file"),
+        array(0, 7, 0, "PCD_OPA", "x/x-photo-cd-overfiew-file"),
+        array(0, 2, 0, "\x01H", "application/x-executable-file"),
+        array(0, 2, 0, "\x01I", "application/x-executable-file"),
+        array(0, 2, 0, "\x01J", "application/x-executable-file"),
+        array(0, 2, 0, "\x01R", "application/x-executable-file"),
+        array(0, 2, 0, "\x01L", "application/x-executable-file"),
+        array(0, 2, 0, "\x046", "font/linux-psf"),
+        array(0, 4, 0, "FFIL", "font/ttf"),
+        array(65, 4, 0, "FFIL", "font/ttf"),
+        array(0, 4, 0, "LWFN", "font/type1"),
+        array(65, 4, 0, "LWFN", "font/type1"),
+        array(0, 12, 0, "Return-Path:", "message/rfc822"),
+        array(0, 5, 0, "Path:", "message/news"),
+        array(0, 5, 0, "Xref:", "message/news"),
+        array(0, 5, 0, "From:", "message/rfc822"),
+        array(0, 7, 0, "Article", "message/news"),
+        array(0, 5, 0, "BABYL", "message/x-gnu-rmail"),
+        array(0, 9, 0, "Received:", "message/rfc822"),
+        array(0, 2, 0, "MZ", "application/x-ms-dos-executable"),
+        array(2080, 27, 0, "Microsoft Word 6.0 Document", "text/vnd.ms-word"),
+        array(2080, 26, 0, "Documento Microsoft Word 6", "text/vnd.ms-word"),
+        array(2112, 9, 0, "MSWordDoc", "text/vnd.ms-word"),
+        array(0, 5, 0, "PO^Q`", "text/vnd.ms-word"),
+        array(2080, 29, 0, "Microsoft Excel 5.0 Worksheet", "application/vnd.ms-excel"),
+        array(2114, 5, 0, "Biff5", "application/vnd.ms-excel"),
+        array(1, 3, 0, "WPC", "text/vnd.wordperfect"),
+        array(0, 4, 0377777777, 0x7018600, "NetBSD/i386"),
+        array(0, 4, 0377777777, 0x7018700, "NetBSD/m68k"),
+        array(0, 4, 0377777777, 0x7018800, "NetBSD/m68k4k"),
+        array(0, 4, 0377777777, 0x7018900, "NetBSD/ns32532"),
+        array(0, 4, 0377777777, 0x7018a00, "NetBSD/sparc"),
+        array(0, 4, 0377777777, 0x7018b00, "NetBSD/pmax"),
+        array(0, 4, 0377777777, 0x7018c00, "NetBSD/vax"),
+        array(0, 4, 0377777777, 0x7018e00, "NetBSD/mips"),
+        array(0, 4, 0377777777, 0x7018f00, "NetBSD/arm32"),
+        array(0, 16, 0, "StartFontMetrics", "font/x-sunos-news"),
+        array(0, 9, 0, "StartFont", "font/x-sunos-news"),
+        array(0, 4, 0, "D)z\x13", "font/x-sunos-news"),
+        array(0, 4, 0, "G)z\x13", "font/x-sunos-news"),
+        array(0, 4, 0, "P)z\x13", "font/x-sunos-news"),
+        array(0, 4, 0, "Q)z\x13", "font/x-sunos-news"),
+        array(8, 4, 0, "E+z\x13", "font/x-sunos-news"),
+        array(8, 4, 0, "H+z\x13", "font/x-sunos-news"),
+        array(0, 2, 0, "%!", "application/postscript"),
+        array(0, 3, 0, "\004%!", "application/postscript"),
+        array(0, 3, 0, "\033E\033", "image/x-pcl-hp"),
+        array(0, 14, 0, "<!DOCTYPE HTML", "text/html"),
+        array(0, 14, 0, "<!doctype html", "text/html"),
+        array(0, 5, 0, "<HEAD", "text/html"),
+        array(0, 5, 0, "<head", "text/html"),
+        array(0, 6, 0, "<TITLE", "text/html"),
+        array(0, 6, 0, "<title", "text/html"),
+        array(0, 5, 0, "<html", "text/html"),
+        array(0, 5, 0, "<HTML", "text/html"),
+        array(0, 2, 0, "\367\203", "font/x-tex"),
+        array(0, 2, 0, "\367\131", "font/x-tex"),
+        array(0, 2, 0, "\367\312", "font/x-tex"),
+        array(2, 2, 0, "\000\021", "font/x-tex-tfm"),
+        array(2, 2, 0, "\000\022", "font/x-tex-tfm"),
+        array('>2', 2, 0, "º¾", "application/java"),
+        array(8, 4, 0, "AIFF", "audio/x-aiff"),
+        array(8, 4, 0, "AIFC", "audio/x-aiff"),
+        array(8, 4, 0, "8SVX", "audio/x-aiff"),
+        array('>8', 4, 0, "WAVE", "audio/x-wav"),
+        array('>8', 3, 0, "AVI", "video/x-msvideo"),
+        array(0, 3, 0, "ID3", "audio/mpeg"),
+        array(0, 4, 0, "OggS", "audio/x-ogg"),
+        array(0, 6, 0, "/* XPM", "image/x-xpm"),
+        array(16, 2, 0, "==", "image/x-3ds"),
+        array(0, 11, 0, "#!/bin/tcsh", "application/x-shellscript"),
+        array(0, 12, 0, "#! /bin/tcsh", "application/x-shellscript"),
+        array(0, 18, 0, "#! /usr/local/tcsh", "application/x-shellscript"),
+        array('>8', 6, 0, "debian", "application/x-debian-package"),
+        array('>2', 2, 0, "Ûî", "application/x-rpm"),
+        array(2, 5, 0, "-lh -", "application/x-lha"),
+        array(2, 5, 0, "-lh6-", "application/x-lha"),
+        array(2, 5, 0, "-lh7-", "application/x-lha"),
+        array(0, 15, 0, "<MakerScreenFon", "application/x-frame"),
+        array(0, 5, 0, "<Book", "application/x-frame"),
+        array(0, 3, 0, "<h1", "text/html"),
+        array(0, 3, 0, "<H1", "text/html"),
+        array(0, 14, 0, "<!doctype HTML", "text/html"),
+        array(0, 2, 0, "MM", "image/tiff"),
+        array(0, 2, 0, "II", "image/tiff"),
+        array(0, 6, 0, "GIF94z", "image/unknown"),
+        array(0, 6, 0, "FGF95a", "image/unknown"),
+        array(0, 3, 0, "PBF", "image/unknown"),
+        array(0, 3, 0, "GIF", "image/gif"),
+        array(0, 4, 0, "\376\067\0\043", "application/msword"),
+        array(0, 6, 0, "\320\317\021\340\241\261", "application/msword"),
+        array(0, 6, 0, "\333\245-\0\0\0", "application/msword"),
+        array(0, 2, 0, "\x02÷", "application/x-dvi"),
+        array(0, 2, 0, "¯\x11", "video/fli"),
+        array(0, 2, 0, "¯\x12", "video/flc"),
+        array('>8', 4, 0, "AVI ", "video/avi"),
+        array(0, 1, 0, "\x01", "video/unknown"),
+        array(0, 1, 0, "\x02", "video/unknown"),
+        array(0, 19, 0, "[KDE Desktop Entry]", "application/x-kdelnk"),
+        array(0, 18, 0, "\# KDE Config File", "application/x-kdelnk"),
+        array(0, 7, 0, "\# xmcd", "text/xmcd"),
+        array(0, 4, 0, "\x8aMNG", "video/x-mng"),
+        array(0, 4, 0, "ó\x03\x00\x00", "application/x-executable-file"),
+        array(0, 4, 0, "ç\x03\x00\x00", "application/x-library-file"),
+        array(0, 4, 0, "³\x01\x00\x00", "video/mpeg"),
+        array(0, 4, 0, "º\x01\x00\x00", "video/mpeg"),
+        array(0, 4, 0, "\x00\x00l", "application/x-apl-workspace"),
+        array(0, 4, 0, "\x00\x00ÿm", "application/x-ar"),
+        array(0, 4, 0, "\x00\x00ÿe", "application/data"),
+        array(0, 4, 0, "\x00\x00\x01\x06", "application/x-executable-file"),
+        array(0, 4, 0, "G\x01\x00\x00", "application/x-object-file"),
+        array(0, 4, 0, "K\x01\x00\x00", "application/x-executable-file"),
+        array(0, 4, 0, "M\x01\x00\x00", "application/x-executable-file"),
+        array(0, 4, 0, "O\x01\x00\x00", "application/x-executable-file"),
+        array(24, 4, 0, "kê\x00\x00", "application/data"),
+        array(24, 4, 0, "lê\x00\x00", "application/data"),
+        array(24, 4, 0, "mê\x00\x00", "application/data"),
+        array(24, 4, 0, "nê\x00\x00", "application/data"),
+        array(0, 4, 0, "\x01\x00\x00", "application/x-object-file"),
+        array(0, 4, 0, "‡\x01\x00\x00", "application/data"),
+        array(24, 4, 0, "\x00\x00êl", "application/x-dump"),
+        array(24, 4, 0, "\x00\x00êk", "application/x-dump"),
+        array(0, 4, 0, "\x00\x00¾1", "text/vnd.ms-word"),
+        array(0, 2, 0, "\x00\x00", "audio/mpeg"),
+        array('>16', 2, 0, "\x00\x01", "application/x-object"),
+        array('>16', 2, 0, "\x00\x02", "application/x-executable"),
+        array('>16', 2, 0, "\x00\x03", "application/x-sharedlib"),
+        array('>16', 2, 0, "\x00\x04", "application/x-coredump"),
+        array(0, 4, 0, "\x00\x00\x00Ì", "application/x-executable-file"),
+        array(0, 4, 0, "\x04\x00\x00\x00", "font/x-snf"),
+        array(0, 4, 0, "\x00\x00\x00\x04", "font/x-snf"),
+        array('>12', 4, 0, "\x01\x00\x00\x00", "audio/basic"),
+        array('>12', 4, 0, "\x02\x00\x00\x00", "audio/basic"),
+        array('>12', 4, 0, "\x03\x00\x00\x00", "audio/basic"),
+        array('>12', 4, 0, "\x04\x00\x00\x00", "audio/basic"),
+        array('>12', 4, 0, "\x05\x00\x00\x00", "audio/basic"),
+        array('>12', 4, 0, "\x06\x00\x00\x00", "audio/basic"),
+        array('>12', 4, 0, "\x07\x00\x00\x00", "audio/basic"),
+        array('>12', 4, 0, "\x17\x00\x00\x00", "audio/x-adpcm"),
+        array('>12', 4, 0, "\x00\x00\x00\x01", "audio/x-dec-basic"),
+        array('>12', 4, 0, "\x00\x00\x00\x02", "audio/x-dec-basic"),
+        array('>12', 4, 0, "\x00\x00\x00\x03", "audio/x-dec-basic"),
+        array('>12', 4, 0, "\x00\x00\x00\x04", "audio/x-dec-basic"),
+        array('>12', 4, 0, "\x00\x00\x00\x05", "audio/x-dec-basic"),
+        array('>12', 4, 0, "\x00\x00\x00\x06", "audio/x-dec-basic"),
+        array('>12', 4, 0, "\x00\x00\x00\x07", "audio/x-dec-basic"),
+        array('>12', 4, 0, "\x00\x00\x00\x17", "audio/x-dec-adpcm")
+   );
+
+   $fd = substr($binary_data, 0, 3072);
+   foreach ($mime_magic_data as $def) {
+      $pos0 = $def[0];
+      if ($pos0[0] == ">") {
+         $pos0 = substr($pos0, 1);
+         if (@strpos($fd, $def[3], $pos0) !== false) {
+               return($def[4]);
+         }
+      } else {
+         $part = substr($fd, $pos0, $def[1]);
+         $mask = $def[2];
+         if ($mask) {
+             // if $mask is 0
+            $value = 1 * ('0x'.bin2hex($part));
+            if (($value & $mask) == $def[3]) {
+               return($def[4]);
+            }
+         } else {
+            if ($part == $def[3]) {
+               return($def[4]);
+            }
+         }
+      }
+   }
+}
diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index b594ca3f29c..b4a70e984f6 100644
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -36,36 +36,6 @@
  *
  */
 
-/**
- *
- * TODO LIST:
- *
- * 1. Add needed fields to wiki table. DONE
- * 2. Rename other wiki tables. DONE
- * 3. Create new wiki tables. DONE BUT NOT FINISHED, WATING FOR NEW TABLES
- * 4. Move/Adapt/Transform configurations info to new structure
- * 5. Migrate wiki entries to subwikis. DONE
- * 6. Fill pages table with latest versions of every page. DONE
- * 7. Migrate page history to new table (transforming formats). DONE, BUT STILL WORKING
- * 8. Fill links table
- * 9. Drop useless information
- *
- * ADITIONAL THINGS AFTER CHAT WITH ELOY:
- *
- * 1. addField is deprecated. DONE
- * 2. Fix SQL error at block 3. DONE
- * 3. Merge set_field_select with previous update sentence. DONE
- * 4. Don't insert id fields on database (it won't work on mssql, oracle, pg). DONE.
- * 5. Use upgrade_set_timeout function.
- * 6. Use grafic of progess
- *
- * OTHER THINGS:
- *
- * 1. Use recordset instead of record when migrating historic
- * 2. Select only usefull data on block 06
- *
- */
-
 function xmldb_wiki_upgrade($oldversion) {
     global $CFG, $DB, $OUTPUT;
 
@@ -149,9 +119,9 @@ function xmldb_wiki_upgrade($oldversion) {
         /**
          * Migrating wiki entries to new subwikis
          */
-        $sql = "INSERT into {wiki_subwikis} (wikiid, groupid, userid)
-                    SELECT DISTINCT e.wikiid, e.groupid, e.userid
-                    FROM {wiki_entries_old} e";
+        $sql = "INSERT INTO {wiki_subwikis} (wikiid, groupid, userid)
+                SELECT DISTINCT e.wikiid, e.groupid, e.userid
+                  FROM {wiki_entries_old} e";
         echo $OUTPUT->notification('Migrating old entries to new subwikis', 'notifysuccess');
 
         $DB->execute($sql, array());
@@ -161,30 +131,39 @@ function xmldb_wiki_upgrade($oldversion) {
 
     // Step 5: Migrating pages
     if ($oldversion < 2010040105) {
-        /**
-         * Filling pages table with latest versions of every page.
-         *
-         * @TODO:   Ensure that ALL versions of every page are always in database and
-         *          they can be removed or cleaned.
-         *          That fact could let us rewrite the subselect to execute a count(*) to avoid
-         *          the order by and it would be much faster.
-         */
 
-        $sql = "INSERT into {wiki_pages} (subwikiid, title, cachedcontent, timecreated, timemodified, userid, pageviews)
-                    SELECT s.id, p.pagename, ?, p.created, p.lastmodified, p.userid, p.hits
-                    FROM {wiki_pages_old} p
-                    LEFT OUTER JOIN {wiki_entries_old} e ON e.id = p.wiki
-                    LEFT OUTER JOIN {wiki_subwikis} s
-                    ON s.wikiid = e.wikiid AND s.groupid = e.groupid AND s.userid = e.userid
-                    WHERE p.version = (
-                        SELECT max(po.version)
-                        FROM {wiki_pages_old} po
-                        WHERE p.pagename = po.pagename and
-                        p.wiki = po.wiki
-                    )";
+        // select all wiki pages
+        $sql = "SELECT s.id, p.pagename, p.created, p.lastmodified, p.userid, p.hits
+                  FROM {wiki_pages_old} p
+                  LEFT OUTER JOIN {wiki_entries_old} e ON e.id = p.wiki
+                  LEFT OUTER JOIN {wiki_subwikis} s ON s.wikiid = e.wikiid AND s.groupid = e.groupid AND s.userid = e.userid
+                 WHERE p.version = (SELECT max(po.version)
+                                      FROM {wiki_pages_old} po
+                                     WHERE p.pagename = po.pagename AND p.wiki = po.wiki)";
         echo $OUTPUT->notification('Migrating old pages to new pages', 'notifysuccess');
 
-        $DB->execute($sql, array('**reparse needed**'));
+        $records = $DB->get_recordset_sql($sql);
+        foreach ($records as $record) {
+            $page = new stdclass();
+            $page->subwikiid     = $record->id;
+            $page->title         = $record->pagename;
+            $page->cachedcontent = '**reparse needed**';
+            $page->timecreated   = $record->created;
+            $page->timemodified  = $record->lastmodified;
+            $page->userid        = $record->userid;
+            $page->pageviews     = $record->hits;
+            try {
+                // make sure there is no duplicated records exist
+                if (!$DB->record_exists('wiki_pages', array('subwikiid'=>$record->id, 'userid'=>$record->userid, 'title'=>$record->pagename))) {
+                    $DB->insert_record('wiki_pages', $page);
+                }
+            } catch (dml_exception $e) {
+                // catch possible insert exception
+                debugging($e->getMessage());
+                continue;
+            }
+        }
+        $records->close();
 
         upgrade_mod_savepoint(true, 2010040105, 'wiki');
     }
@@ -295,22 +274,6 @@ function xmldb_wiki_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2010040109, 'wiki');
     }
 
-    // TODO: Will hold the old tables so we will have chance to fix problems
-    // Will remove old tables once migrating 100% stable
-    // Step 10: delete old tables
-    if ($oldversion < 2010040120) {
-        //$tables = array('wiki_pages', 'wiki_locks', 'wiki_entries');
-
-        //foreach ($tables as $tablename) {
-            //$table = new xmldb_table($tablename . '_old');
-            //if ($dbman->table_exists($table)) {
-                //$dbman->drop_table($table);
-            //}
-        //}
-        //echo $OUTPUT->notification('Droping old tables', 'notifysuccess');
-        //upgrade_mod_savepoint(true, 2010040120, 'wiki');
-    }
-
     if ($oldversion < 2010080201) {
 
         $sql = "UPDATE {comments}
@@ -360,5 +323,21 @@ function xmldb_wiki_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2010102800, 'wiki');
     }
 
+    // TODO: Will hold the old tables so we will have chance to fix problems
+    // Will remove old tables once migrating 100% stable
+    // Step 10: delete old tables
+    //if ($oldversion < 2011000000) {
+        //$tables = array('wiki_pages', 'wiki_locks', 'wiki_entries');
+
+        //foreach ($tables as $tablename) {
+            //$table = new xmldb_table($tablename . '_old');
+            //if ($dbman->table_exists($table)) {
+                //$dbman->drop_table($table);
+            //}
+        //}
+        //echo $OUTPUT->notification('Droping old tables', 'notifysuccess');
+        //upgrade_mod_savepoint(true, 2011000000, 'wiki');
+    //}
+
     return true;
 }
diff --git a/mod/wiki/db/upgradelib.php b/mod/wiki/db/upgradelib.php
index d4a961ceb86..1fd3d44fc37 100644
--- a/mod/wiki/db/upgradelib.php
+++ b/mod/wiki/db/upgradelib.php
@@ -202,23 +202,52 @@ function wiki_upgrade_install_20_tables() {
  */
 function wiki_upgrade_migrate_versions() {
     global $DB, $CFG, $OUTPUT;
-    upgrade_set_timeout();
     require_once($CFG->dirroot . '/mod/wiki/db/migration/lib.php');
-    $sql = "SELECT po.id as oldpage_id, po.pagename as oldpage_pagename, po.version, po.flags, po.content, po.author, po.userid as oldpage_userid, po.created, po.lastmodified, po.refs, po.meta, po.hits, po.wiki,
-                p.id as newpage_id, p.subwikiid, p.title, p.cachedcontent, p.timecreated, p.timemodified as newpage_timemodified, p.timerendered, p.userid as newpage_userid, p.pageviews, p.readonly,
-                e.id as entry_id, e.wikiid, e.course as entrycourse, e.groupid, e.userid as entry_userid, e.pagename as entry_pagename, e.timemodified as entry_timemodified,
-                w.id as wiki_id, w.course as wiki_course, w.name, w.summary as summary, w.pagename as wiki_pagename, w.wtype, w.ewikiprinttitle, w.htmlmode, w.ewikiacceptbinary, w.disablecamelcase, w.setpageflags, w.strippages, w.removepages, w.revertchanges, w.initialcontent, w.timemodified as wiki_timemodified
-                FROM {wiki_pages_old} po LEFT OUTER JOIN {wiki_entries_old} e
-                ON e.id = po.wiki
-                LEFT OUTER JOIN {wiki} w
-                ON w.id = e.wikiid
-                LEFT OUTER JOIN {wiki_subwikis} s
-                ON e.groupid = s.groupid AND e.wikiid = s.wikiid AND e.userid = s.userid
-                LEFT OUTER JOIN {wiki_pages} p
-                ON po.pagename = p.title AND p.subwikiid = s.id";
+    // need to move the binary data in db
+    $fs = get_file_storage();
+    // select all wiki pages history
+    $sql = "SELECT po.id AS oldpage_id, po.pagename AS oldpage_pagename, po.version, po.flags,
+                   po.content, po.author, po.userid AS oldpage_userid, po.created, po.lastmodified, po.refs, po.meta, po.hits, po.wiki,
+                   p.id AS newpage_id, p.subwikiid, p.title, p.cachedcontent, p.timecreated, p.timemodified AS newpage_timemodified,
+                   p.timerendered, p.userid AS newpage_userid, p.pageviews, p.readonly, e.id AS entry_id, e.wikiid, e.course AS entrycourse,
+                   e.groupid, e.userid AS entry_userid, e.pagename AS entry_pagename, e.timemodified AS entry_timemodified,
+                   w.id AS wiki_id, w.course AS wiki_course, w.name, w.summary AS summary, w.pagename AS wiki_pagename, w.wtype,
+                   w.ewikiprinttitle, w.htmlmode, w.ewikiacceptbinary, w.disablecamelcase, w.setpageflags, w.strippages, w.removepages,
+                   w.revertchanges, w.initialcontent, w.timemodified AS wiki_timemodified,
+                   cm.id AS cmid
+              FROM {wiki_pages_old} po
+              LEFT OUTER JOIN {wiki_entries_old} e ON e.id = po.wiki
+              LEFT OUTER JOIN {wiki} w ON w.id = e.wikiid
+              LEFT OUTER JOIN {wiki_subwikis} s ON e.groupid = s.groupid AND e.wikiid = s.wikiid AND e.userid = s.userid
+              LEFT OUTER JOIN {wiki_pages} p ON po.pagename = p.title AND p.subwikiid = s.id
+              JOIN {modules} m ON m.name = 'wiki'
+              JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = w.id)";
+
     $pagesinfo = $DB->get_recordset_sql($sql, array());
 
     foreach ($pagesinfo as $pageinfo) {
+        upgrade_set_timeout();
+
+        $mimetype = ewiki_mime_magic($pageinfo->content);
+        if (!empty($mimetype)) {
+            // if mimetype is not empty, means this is a file stored in db
+            $context = get_context_instance(CONTEXT_MODULE, $pageinfo->cmid);
+            // clean up file name
+            $filename = clean_param($pageinfo->oldpage_pagename, PARAM_FILE);
+            $filerecord = array('contextid' => $context->id,
+                                'component' => 'mod_wiki',
+                                'filearea'  => 'attachments',
+                                'itemid'    => $pageinfo->subwikiid,
+                                'filepath'  => '/',
+                                'filename'  => $filename,
+                                'userid'    => $pageinfo->oldpage_userid);
+            if (!$fs->file_exists($context->id, 'mod_wiki', 'attachments', $pageinfo->subwikiid, '/', $pageinfo->pagename)) {
+                $storedfile = $fs->create_file_from_string($filerecord, $pageinfo->content);
+            }
+
+            // replace page content to a link point to the file
+            $pageinfo->content = "<a href='@@PLUGINFILE@@/$filename'>$pageinfo->oldpage_pagename</a>";
+        }
 
         $oldpage = new StdClass();
         $oldpage->id = $pageinfo->oldpage_id;
@@ -276,8 +305,9 @@ function wiki_upgrade_migrate_versions() {
 
         $version = new StdClass();
         $version->pageid = $page->id;
+        // convert wiki content to html format
         $version->content = wiki_ewiki_2_html($entry, $oldpage, $wiki);
-        $version->contentformat = "html";
+        $version->contentformat = 'html';
         $version->version = $oldpage->version;
         $version->timecreated = $oldpage->lastmodified;
         $version->userid = $oldpage->userid;
@@ -292,14 +322,14 @@ function wiki_upgrade_migrate_versions() {
                 $version->version = 1;
                 $version->content = $content;
                 $DB->insert_record('wiki_versions', $version);
-            } catch (Exception $e) {
-                echo $OUTPUT->notification('Cannot insert this record, page id: ' . $page->id);
+            } catch (dml_exception $e) {
+                debugging($e->getMessage());
             }
         } else {
             try {
                 $DB->insert_record('wiki_versions', $version);
-            } catch (Exception $e) {
-                echo $OUTPUT->notification('Cannot insert this record, page id: ' . $page->id);
+            } catch (dml_exception $e) {
+                debugging($e->getMessage());
             }
         }
     }
diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index 6f077953016..2ff2741b5ec 100644
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -261,6 +261,9 @@ function wiki_refresh_cachedcontent($page, $newcontent = null) {
     global $DB;
 
     $version = wiki_get_current_version($page->id);
+    if (empty($version)) {
+        return null;
+    }
     if (!isset($newcontent)) {
         $newcontent = $version->content;
     }
@@ -299,7 +302,11 @@ function wiki_refresh_page_links($page, $links) {
             $newlink->topageid = $linkinfo['pageid'];
         }
 
-        $DB->insert_record('wiki_links', $newlink);
+        try {
+            $DB->insert_record('wiki_links', $newlink);
+        } catch (dml_exception $e) {
+            debugging($e->getMessage());
+        }
 
     }
 }