From e893086931735c48bc913364ff623314d5e59cef Mon Sep 17 00:00:00 2001 From: Frank Ronny Larsen Date: Wed, 18 Dec 2013 11:32:18 +0100 Subject: [PATCH 1/2] BUGFIX: Unknown regexp modifier 'k' removed --- h5p.classes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index b17d33e..b73b788 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -280,7 +280,7 @@ class H5PValidator { 'w' => '/^[0-9]{1,4}$/', 'h' => '/^[0-9]{1,4}$/', 'metaKeywords' => '/^.{1,}$/', - 'metaDescription' => '/^.{1,}$/k', + 'metaDescription' => '/^.{1,}$/', ); // Schemas used to validate the library files From ec10ce034ec31f557a860bdee2b51794addf667c Mon Sep 17 00:00:00 2001 From: Frank Ronny Larsen Date: Wed, 18 Dec 2013 11:32:57 +0100 Subject: [PATCH 2/2] BUGFIX: Replace str_replace with preg_quote --- h5p.classes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h5p.classes.php b/h5p.classes.php index b73b788..b734c1a 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -1464,7 +1464,7 @@ class H5PContentValidator { // Check if string is according to optional regexp in semantics if (isset($semantics->regexp)) { // Escaping '/' found in patterns, so that it does not break regexp fencing. - $pattern = '/' . str_replace('/', '\\/', $semantics->regexp->pattern) . '/'; + $pattern = '/' . preg_quote($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