From 87f6f3c9702993a4e653ce9178e117c576c6f35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20J=C3=B8rgensen?= Date: Tue, 12 Nov 2019 16:04:50 +0100 Subject: [PATCH] Revert "Allow the dependency path to be overridden by child classes" --- h5p.classes.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/h5p.classes.php b/h5p.classes.php index fbdc99f..6eb3c3e 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2432,7 +2432,7 @@ class H5PCore { // Using content dependencies foreach ($dependencies as $dependency) { if (isset($dependency['path']) === FALSE) { - $dependency['path'] = $this->getDependencyPath($dependency); + $dependency['path'] = 'libraries/' . H5PCore::libraryToString($dependency, TRUE); $dependency['preloadedJs'] = explode(',', $dependency['preloadedJs']); $dependency['preloadedCss'] = explode(',', $dependency['preloadedCss']); } @@ -2452,16 +2452,6 @@ class H5PCore { return $files; } - /** - * Get the path to the dependency. - * - * @param array $dependency - * @return string - */ - protected function getDependencyPath(array $dependency): string { - return 'libraries/' . H5PCore::libraryToString($dependency, TRUE); - } - private static function getDependenciesHash(&$dependencies) { // Build hash of dependencies $toHash = array();