Merge branch 'hotfix/9/10' into 'release_9'

Customizing/Init: Fix wrong path value in `ILIAS_WEB_DIR` constant Closes ILIAS-eLearning#10 See merge request ilias-hosting/ilias!18
thojou · Dec 10, 2024 · ea68c5b · ea68c5b
2 parents e0bd912 + f757f5d
commit ea68c5b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 5 deletions.
diff --git a/Services/Component/classes/Setup/class.ilComponentActivatePluginsObjective.php b/Services/Component/classes/Setup/class.ilComponentActivatePluginsObjective.php
@@ -179,7 +179,9 @@ public function __construct()
         }
 
         if (!defined("ILIAS_WEB_DIR")) {
-            define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/");
+            // databay-patch: begin ilias_web_dir
+            define('ILIAS_WEB_DIR', 'data');
+            // databay-patch: end ilias_web_dir
         }
 
         // initialise this last to make sure the environment defined here

diff --git a/Services/Component/classes/Setup/class.ilComponentInstallPluginObjective.php b/Services/Component/classes/Setup/class.ilComponentInstallPluginObjective.php
@@ -191,7 +191,9 @@ public function __construct()
         }
 
         if (!defined("ILIAS_WEB_DIR")) {
-            define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/");
+            // databay-patch: begin ilias_web_dir
+            define('ILIAS_WEB_DIR', 'data');
+            // databay-patch: end ilias_web_dir
         }
 
         // initialise this last to make sure the environment defined here

diff --git a/Services/Component/classes/Setup/class.ilComponentUpdatePluginObjective.php b/Services/Component/classes/Setup/class.ilComponentUpdatePluginObjective.php
@@ -211,7 +211,9 @@ public function __construct()
         }
 
         if (!defined("ILIAS_WEB_DIR")) {
-            define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/");
+            // databay-patch: begin ilias_web_dir
+            define('ILIAS_WEB_DIR', 'data');
+            // databay-patch: end ilias_web_dir
         }
 
         // initialise this last to make sure the environment defined here

diff --git a/Services/Language/classes/Setup/class.ilPluginLanguageUpdatedObjective.php b/Services/Language/classes/Setup/class.ilPluginLanguageUpdatedObjective.php
@@ -188,7 +188,9 @@ public function __construct()
         }
 
         if (!defined("ILIAS_WEB_DIR")) {
-            define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/");
+            // databay-patch: begin ilias_web_dir
+            define('ILIAS_WEB_DIR', 'data');
+            // databay-patch: end ilias_web_dir
         }
 
         return [$ORIG_DIC, $ORIG_ilDB];

diff --git a/Services/ResourceStorage/classes/Setup/class.ilResourceStorageMigrationHelper.php b/Services/ResourceStorage/classes/Setup/class.ilResourceStorageMigrationHelper.php
@@ -72,7 +72,9 @@ public function __construct(
             define("CLIENT_WEB_DIR", dirname(__DIR__, 4) . "/data/" . $client_id);
         }
         if (!defined("ILIAS_WEB_DIR")) {
-            define("ILIAS_WEB_DIR", dirname(__DIR__, 4));
+            // databay-patch: begin ilias_web_dir
+            define('ILIAS_WEB_DIR', 'data');
+            // databay-patch: end ilias_web_dir
         }
         if (!defined("CLIENT_ID")) {
             define("CLIENT_ID", $client_id);

diff --git a/docs/databay/patches/ilias_web_dir_constant.md b/docs/databay/patches/ilias_web_dir_constant.md
@@ -0,0 +1,22 @@
+# Fix `ILIAS_WEB_DIR` constant
+
+Dieser Patch korrigiert eine falsche Belegung der globalen PHP-Konstante `ILIAS_WEB_DIR` im
+Setup-Kontext.
+
+## Patch-Markierungen
+
+Patches wurden mit `databay-patch: begin ilias_web_dir` und `databay-patch: end ilias_web_dir` markiert.
+
+## Änderungen
+
+Angepasst wurden im Rahmen der Funktionalität folgende Dateien:
+
+* Services/Component/classes/Setup/class.ilComponentActivatePluginsObjective.php
+* Services/Component/classes/Setup/class.ilComponentInstallPluginObjective.php
+* Services/Component/classes/Setup/class.ilComponentUpdatePluginObjective.php
+* Services/Language/classes/Setup/class.ilPluginLanguageUpdatedObjective.php
+* Services/ResourceStorage/classes/Setup/class.ilResourceStorageMigrationHelper.php
+
+## Spezifikation
+
+See: https://mantis.ilias.de/view.php?id=43107#c110424