Fix variable usage consistency

Author: icc

Diff for: h5peditor.class.php

@@ -379,21 +379,21 @@ public function getLibraryData($machineName, $majorVersion, $minorVersion, $lang
     $library = $this->h5p->loadLibrary($machineName, $majorVersion, $minorVersion);
 
     // Include name and version in data object for convenience
-    $libraryData->name = $machineName;
-    $libraryData->version = (object) array('major' => $majorVersion, 'minor' => $minorVersion);
+    $libraryData->name = $library['machineName'];
+    $libraryData->version = (object) array('major' => $library['majorVersion'], 'minor' => $library['minorVersion']);
     $libraryData->title = $library['title'];
 
-    $libraryData->upgradesScript = $this->h5p->fs->getUpgradeScript($machineName, $majorVersion, $minorVersion);
+    $libraryData->upgradesScript = $this->h5p->fs->getUpgradeScript($library['machineName'], $library['majorVersion'], $library['minorVersion']);
     if ($libraryData->upgradesScript !== NULL) {
       // If valid add URL prefix
       $libraryData->upgradesScript = $this->h5p->url . $prefix . $libraryData->upgradesScript;
     }
 
-    $libraries              = $this->findEditorLibraries($machineName, $majorVersion, $minorVersion);
-    $libraryData->semantics = $this->h5p->loadLibrarySemantics($machineName, $majorVersion, $minorVersion);
-    $libraryData->language  = $this->getLibraryLanguage($machineName, $majorVersion, $minorVersion, $languageCode);
-    $libraryData->defaultLanguage = empty($defaultLanguage) ? NULL : $this->getLibraryLanguage($machineName, $majorVersion, $minorVersion, $defaultLanguage);
-    $libraryData->languages = $this->storage->getAvailableLanguages($machineName, $majorVersion, $minorVersion);
+    $libraries              = $this->findEditorLibraries($library['machineName'], $library['majorVersion'], $library['minorVersion']);
+    $libraryData->semantics = $this->h5p->loadLibrarySemantics($library['machineName'], $library['majorVersion'], $library['minorVersion']);
+    $libraryData->language  = $this->getLibraryLanguage($library['machineName'], $library['majorVersion'], $library['minorVersion'], $languageCode);
+    $libraryData->defaultLanguage = empty($defaultLanguage) ? NULL : $this->getLibraryLanguage($library['machineName'], $library['majorVersion'], $library['minorVersion'], $defaultLanguage);
+    $libraryData->languages = $this->storage->getAvailableLanguages($library['machineName'], $library['majorVersion'], $library['minorVersion']);
 
     // Temporarily disable asset aggregation
     $aggregateAssets            = $this->h5p->aggregateAssets;