Merge pull request ILIAS-eLearning#2851 from klees/release_6_28284

UICore: improve handling of paths in reader
klees · Aug 31, 2020 · 16224f4 · 16224f4
2 parents 86b34b5 + 02463c1
commit 16224f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Services/UICore/classes/Setup/class.ilCtrlStructureReader.php b/Services/UICore/classes/Setup/class.ilCtrlStructureReader.php
@@ -96,7 +96,7 @@ public function readStructure(
      */
     private function normalizePath(string $path) : string
     {
-        return str_replace(['//'], ['/'], $path);
+        return realpath(str_replace(['//'], ['/'], $path));
     }
 
     /**
@@ -270,7 +270,7 @@ public function store($a_cdir = "./..")
                 $ilDB->quote($file, "text"),
                 $ilDB->quote($this->comp_prefix, "text"),
                 $ilDB->quote($this->plugin_path, "text")
-                ));
+            ));
         }
         //$this->class_childs[$parent][] = $child;
         foreach ($this->class_childs as $parent => $v) {
@@ -301,7 +301,7 @@ public function determineClassFileIds()
         $ilDB->manipulate(
             "UPDATE ctrl_classfile SET " .
             " cid = " . $ilDB->quote("", "text")
-            );
+        );
         $set = $ilDB->query("SELECT * FROM ctrl_classfile ");
         $cnt = 1;
         while ($rec = $ilDB->fetchAssoc($set)) {
@@ -310,7 +310,7 @@ public function determineClassFileIds()
                 "UPDATE ctrl_classfile SET " .
                 " cid = " . $ilDB->quote($cid, "text") .
                 " WHERE class = " . $ilDB->quote($rec["class"], "text")
-                );
+            );
             $cnt++;
         }
     }

diff --git a/Services/UICore/classes/Setup/class.ilCtrlStructureStoredObjective.php b/Services/UICore/classes/Setup/class.ilCtrlStructureStoredObjective.php
@@ -74,7 +74,7 @@ public function achieve(Setup\Environment $environment) : Setup\Environment
 
         $reader = $this->ctrl_reader->withDB($db);
         $reader->executed = false;
-        $reader->readStructure(true, ".");
+        $reader->readStructure(true);
         return $environment;
     }
 }