Browse Source

Add plugin/ticket/ to the list of deprecated directories that should be removed on install

Yannick Warnier 8 years ago
parent
commit
743c97a508
2 changed files with 10 additions and 5 deletions
  1. 6 5
      main/install/install.lib.php
  2. 4 0
      main/install/update-files-1.10.0-1.11.0.inc.php

+ 6 - 5
main/install/install.lib.php

@@ -1062,24 +1062,25 @@ function display_requirements(
 
         $deprecated = [
             api_get_path(SYS_CODE_PATH) . 'exercice/',
-            api_get_path(SYS_CODE_PATH) . 'newscorm/'
+            api_get_path(SYS_CODE_PATH) . 'newscorm/',
+            api_get_path(SYS_PLUGIN_PATH) . 'ticket/'
         ];
-        $deprecatedToRemoved = [];
+        $deprecatedToRemove = [];
 
         foreach ($deprecated as $deprecatedDirectory) {
             if (!is_dir($deprecatedDirectory)) {
                 continue;
             }
 
-            $deprecatedToRemoved[] = $deprecatedDirectory;
+            $deprecatedToRemove[] = $deprecatedDirectory;
         }
 
-        if (count($deprecatedToRemoved) > 0) {
+        if (count($deprecatedToRemove) > 0) {
             $error = true;
             ?>
             <p class="text-danger"><?php echo get_lang('WarningForDeprecatedDirectoriesForUpgrade') ?></p>
             <ul>
-                <?php foreach ($deprecatedToRemoved as $deprecatedDirectory) { ?>
+                <?php foreach ($deprecatedToRemove as $deprecatedDirectory) { ?>
                     <li class="text-danger"><?php echo $deprecatedDirectory ?></li>
                 <?php } ?>
             </ul>

+ 4 - 0
main/install/update-files-1.10.0-1.11.0.inc.php

@@ -33,6 +33,10 @@ if (defined('SYSTEM_INSTALLATION')) {
     if (is_dir($lpPath)) {
         @rrmdir($lpPath);
     }
+    $ticketPluginPath = api_get_path(SYS_PLUGIN_PATH) . 'ticket';
+    if (is_dir($ticketPluginPath)) {
+        @rrmdir($ticketPluginPath);
+    }
 
     if ($debug) {
         error_log('Folders cleaned up');