From 930f85e0fb3a0ee2bcc2496303dbca1c8012cb40 Mon Sep 17 00:00:00 2001
From: Thomas Horn Sivertsen <thomass@cerpus.com>
Date: Mon, 18 Jun 2018 11:24:04 +0200
Subject: [PATCH] HFP-1806 Removed unused changes, fixed indentation

---
 h5p-default-storage.class.php | 14 +++++++-------
 h5p.classes.php               |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/h5p-default-storage.class.php b/h5p-default-storage.class.php
index d6d13ea..26e3e01 100644
--- a/h5p-default-storage.class.php
+++ b/h5p-default-storage.class.php
@@ -451,13 +451,13 @@ class H5PDefaultStorage implements \H5PFileStorage {
     return self::dirReady($this->path);
   }
 
-    /**
-     * Check if the file presave.js exists in the root of the library
-     *
-     * @param string $libraryFolder
-     * @param string $developmentPath
-     * @return bool
-     */
+  /**
+   * Check if the file presave.js exists in the root of the library
+   *
+   * @param string $libraryFolder
+   * @param string $developmentPath
+   * @return bool
+   */
   public function hasPresave($libraryFolder, $developmentPath = null) {
       $path = is_null($developmentPath) ? 'libraries' . DIRECTORY_SEPARATOR . $libraryFolder : $developmentPath;
       $filePath = realpath($this->path . DIRECTORY_SEPARATOR . $path . DIRECTORY_SEPARATOR . 'presave.js');
diff --git a/h5p.classes.php b/h5p.classes.php
index 650895c..d8ed62e 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -2109,9 +2109,8 @@ class H5PCore {
 
     // Using content dependencies
     foreach ($dependencies as $dependency) {
-      $libraryName = H5PCore::libraryToString($dependency, TRUE);
       if (isset($dependency['path']) === FALSE) {
-        $dependency['path'] = 'libraries/' . $libraryName;
+        $dependency['path'] = 'libraries/' . H5PCore::libraryToString($dependency, TRUE);
         $dependency['preloadedJs'] = explode(',', $dependency['preloadedJs']);
         $dependency['preloadedCss'] = explode(',', $dependency['preloadedCss']);
       }