Quellcode durchsuchen

Fix upgrade from 1.9.x

Julio Montoya vor 10 Jahren
Ursprung
Commit
e90870a934

+ 6 - 0
main/install/update-configuration.inc.php

@@ -12,6 +12,12 @@ if (defined('SYSTEM_INSTALLATION')) {
 
     Log::notice("Starting " . basename(__FILE__));
 
+    $oldConfFile = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
+
+    if (file_exists($oldConfFile)) {
+        rename($oldConfFile, api_get_path(CONFIGURATION_PATH) . 'configuration.php');
+    }
+
     // Edit the configuration file
     $file = file(api_get_path(CONFIGURATION_PATH) . 'configuration.php');
     $fh = fopen(api_get_path(CONFIGURATION_PATH) . 'configuration.php', 'w');

+ 6 - 6
main/install/update-files-1.9.0-1.10.0.inc.php

@@ -164,12 +164,12 @@ if (defined('SYSTEM_INSTALLATION')) {
     // Move dirs into new structures.
 
     $movePathList = [
-        api_get_path(SYS_CODE_PATH).'upload/users/groups/' => api_get_path(SYS_UPLOAD_PATH).'groups',
-        api_get_path(SYS_CODE_PATH).'upload/users/' => api_get_path(SYS_UPLOAD_PATH).'users',
-        api_get_path(SYS_CODE_PATH).'upload/badges/' => api_get_path(SYS_UPLOAD_PATH).'badges',
-        api_get_path(SYS_PATH).'courses/' => api_get_path(SYS_COURSE_PATH),
-        api_get_path(SYS_PATH).'searchdb/' => api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb',
-        api_get_path(SYS_PATH).'home/' => api_get_path(SYS_APP_PATH).'home',
+        api_get_path(SYS_CODE_PATH).'upload/users/groups/' => api_get_path(SYS_UPLOAD_PATH),
+        api_get_path(SYS_CODE_PATH).'upload/users/' => api_get_path(SYS_UPLOAD_PATH),
+        api_get_path(SYS_CODE_PATH).'upload/badges/' => api_get_path(SYS_UPLOAD_PATH),
+        api_get_path(SYS_PATH).'courses/' => api_get_path(SYS_APP_PATH),
+        api_get_path(SYS_PATH).'searchdb/' => api_get_path(SYS_UPLOAD_PATH).'plugins/xapian',
+        api_get_path(SYS_PATH).'home/' => api_get_path(SYS_APP_PATH)
     ];
 
     foreach ($movePathList as $origin => $destination) {