diff --git a/main/inc/lib/events.lib.inc.php b/main/inc/lib/events.lib.php old mode 100755 new mode 100644 similarity index 100% rename from main/inc/lib/events.lib.inc.php rename to main/inc/lib/events.lib.php diff --git a/main/install/update-files-1.9.0-1.10.0.inc.php b/main/install/update-files-1.9.0-1.10.0.inc.php index fec171a820..463a0deedd 100644 --- a/main/install/update-files-1.9.0-1.10.0.inc.php +++ b/main/install/update-files-1.9.0-1.10.0.inc.php @@ -137,10 +137,11 @@ if (defined('SYSTEM_INSTALLATION')) { ); $list = scandir($langPath); foreach ($list as $entry) { - if (is_dir($langPath.$entry) && in_array($entry, $officialLanguages)) { + if (is_dir($langPath . $entry) && in_array($entry, $officialLanguages) + ) { foreach ($filesToDelete as $file) { - if (is_file($langPath.$entry.'/'.$file.'.inc.php')) { - unlink($langPath.$entry.'/'.$file.'.inc.php'); + if (is_file($langPath . $entry . '/' . $file . '.inc.php')) { + unlink($langPath . $entry . '/' . $file . '.inc.php'); } } } @@ -148,6 +149,11 @@ if (defined('SYSTEM_INSTALLATION')) { // Remove the "main/conference/" directory that wasn't used since years long // past - see rrmdir function declared below @rrmdir(api_get_path(SYS_CODE_PATH).'conference'); + // Other files that we renamed + // events.lib.inc.php has been renamed to events.lib.php + if (is_file(api_get_path(LIBRARY_PATH).'events.lib.inc.php')) { + @unlink(api_get_path(LIBRARY_PATH).'events.lib.inc.php'); + } } else { echo 'You are not allowed here !'. __FILE__;