diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf new file mode 100644 index 0000000..8b0f54e Binary files /dev/null and b/fonts/FontAwesome.otf differ diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..7c79c6a Binary files /dev/null and b/fonts/fontawesome-webfont.eot differ diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg new file mode 100644 index 0000000..45fdf33 --- /dev/null +++ b/fonts/fontawesome-webfont.svg @@ -0,0 +1,414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..e89738d Binary files /dev/null and b/fonts/fontawesome-webfont.ttf differ diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..8c1748a Binary files /dev/null and b/fonts/fontawesome-webfont.woff differ diff --git a/h5p.classes.php b/h5p.classes.php index ebd0e02..e9a0322 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -1437,9 +1437,8 @@ class H5PContentValidator { // Check if string is according to optional regexp in semantics if (isset($semantics->regexp)) { - // Note: '|' used as regexp fence, to allow / in actual patterns. - // But also escaping '|' found in patterns, so that is valid too. - $pattern = '/' . str_replace('/', '\/', $semantics->regexp->pattern) . '/'; + // Escaping '/' found in patterns, so that it does not break regexp fencing. + $pattern = '/' . str_replace('/', '\\/', $semantics->regexp->pattern) . '/'; $pattern .= isset($semantics->regexp->modifiers) ? $semantics->regexp->modifiers : ''; if (preg_match($pattern, $text) === 0) { // Note: explicitly ignore return value FALSE, to avoid removing text diff --git a/styles/h5p.css b/styles/h5p.css index 2714509..1cbea68 100644 --- a/styles/h5p.css +++ b/styles/h5p.css @@ -2,9 +2,9 @@ font-family: 'FontAwesome'; src:url('../fonts/fontawesome-webfont.eot'); src:url('../fonts/FontAwesome.otf?#iefix') format('embedded-opentype'), - url('../fonts/fontawesome-webfont.woff.woff') format('woff'), + url('../fonts/fontawesome-webfont.woff') format('woff'), url('../fonts/fontawesome-webfont.ttf') format('truetype'), - url('../fonts/fontawesome-webfont.svg#icomoon') format('svg'); + url('../fonts/fontawesome-webfont.svg') format('svg'); font-weight: normal; font-style: normal; }