EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php

namespaces
Frode Petterson 2013-12-20 13:34:18 +01:00
parent 7a3888a367 925e6c73f9
commit cca335b731
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
h5p.classes.php
View File

@ -280,7 +280,7 @@ class H5PValidator {
'w' => '/^[0-9]{1,4}$/', 'w' => '/^[0-9]{1,4}$/',
'h' => '/^[0-9]{1,4}$/', 'h' => '/^[0-9]{1,4}$/',
'metaKeywords' => '/^.{1,}$/', 'metaKeywords' => '/^.{1,}$/',
'metaDescription' => '/^.{1,}$/k', 'metaDescription' => '/^.{1,}$/',
); );
// Schemas used to validate the library files // Schemas used to validate the library files
@ -1472,7 +1472,7 @@ class H5PContentValidator {
// Check if string is according to optional regexp in semantics // Check if string is according to optional regexp in semantics
if (isset($semantics->regexp)) { if (isset($semantics->regexp)) {
// Escaping '/' found in patterns, so that it does not break regexp fencing. // 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 : ''; $pattern .= isset($semantics->regexp->modifiers) ? $semantics->regexp->modifiers : '';
if (preg_match($pattern, $text) === 0) { if (preg_match($pattern, $text) === 0) {
// Note: explicitly ignore return value FALSE, to avoid removing text // Note: explicitly ignore return value FALSE, to avoid removing text