From 7a4489f9853ba9a0c17088f2729ca819a44decab Mon Sep 17 00:00:00 2001 From: tbrehm Date: Tue, 29 Jun 2010 13:17:20 +0000 Subject: [PATCH] Implemented: FS#1101 - Use relative paths for symlinks to enable modules. --- install/lib/installer_base.lib.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 27669ffdc..050bd32b7 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1242,9 +1242,15 @@ class installer_base { $module_name = substr($file,0,-8); $tmp = new $module_name; if($tmp->onInstall()) { - if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file); + if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) { + // @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file); + @symlink($install_dir.'/server/mods-available/'.$file, '../mods-enabled/'.$file); + } if (strpos($file, '_core_module') !== false) { - if(!@is_link($install_dir.'/server/mods-core/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file); + if(!@is_link($install_dir.'/server/mods-core/'.$file)) { + //@symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-core/'.$file); + @symlink($install_dir.'/server/mods-available/'.$file, '../mods-core/'.$file); + } } } unset($tmp); @@ -1263,9 +1269,15 @@ class installer_base { $plugin_name = substr($file,0,-8); $tmp = new $plugin_name; if(method_exists($tmp,'onInstall') && $tmp->onInstall()) { - if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file); + if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) { + // @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file); + @symlink($install_dir.'/server/plugins-available/'.$file, '../plugins-enabled/'.$file); + } if (strpos($file, '_core_plugin') !== false) { - if(!@is_link($install_dir.'/server/plugins-core/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file); + if(!@is_link($install_dir.'/server/plugins-core/'.$file)) { + // @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-core/'.$file); + @symlink($install_dir.'/server/plugins-available/'.$file, '../plugins-core/'.$file); + } } } unset($tmp); -- GitLab