From 415e2171341e79d8eae9801054aeea0509336347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20J=C3=B8rgensen?= Date: Mon, 3 Nov 2014 07:02:45 +0100 Subject: [PATCH 1/2] Fixed URL to h5p.org --- h5p.classes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index e77258c..e31964b 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2188,7 +2188,7 @@ class H5PCore { $platformInfo['uuid'] = $this->h5pF->getOption('h5p_site_uuid', ''); // Adding random string to GET to be sure nothing is cached $random = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 5); - $json = $this->h5pF->fetchExternalData('http://h5p.lvh.me/h5p.org/libraries-metadata.json?api=1&platform=' . urlencode(json_encode($platformInfo)) . '&x=' . urlencode($random)); + $json = $this->h5pF->fetchExternalData('http://h5p.org/libraries-metadata.json?api=1&platform=' . urlencode(json_encode($platformInfo)) . '&x=' . urlencode($random)); if ($json !== NULL) { $json = json_decode($json); if (isset($json->libraries)) { @@ -2320,7 +2320,7 @@ class H5PContentValidator { */ public function validateContentFiles($contentPath, $isLibrary = FALSE) { if ($this->h5pC->disableFileCheck === TRUE) { - return TRUE; + return TRUE; } // Scan content directory for files, recurse into sub directories. From 57db1d99266ca51d08e0d3e916369a9a8ed11397 Mon Sep 17 00:00:00 2001 From: Svein-Tore Griff With Date: Mon, 3 Nov 2014 10:15:23 +0100 Subject: [PATCH 2/2] Revert "Add htmlSpecialChars" This reverts commit 41ed0c18e4fa2ccec5c89958a1237554e759005b. --- h5p.classes.php | 2 +- js/h5p.js | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index e31964b..827903a 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -1526,7 +1526,7 @@ class H5PCore { public static $coreApi = array( 'majorVersion' => 1, - 'minorVersion' => 4 + 'minorVersion' => 3 ); public static $styles = array( 'styles/h5p.css', diff --git a/js/h5p.js b/js/h5p.js index fe257f2..d53f8e2 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1099,10 +1099,3 @@ if (H5P.jQuery) { } }); } - - /** - * Mimics how php's htmlspecialchars works (the way we use it) - */ -H5P.htmlSpecialChars = function(string) { - return string.toString().replace(//g, '>').replace(/'/g, ''').replace(/"/g, '"'); -}; \ No newline at end of file