From 77bbe9d620299bbc6b5aa295aad09b82cbc822a3 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 14 Oct 2012 21:19:11 +0200 Subject: [PATCH] Added *_DIR constants again The previous approach leads to a few issues within the whole initialization process, as the package dir would not be available prior to it's usage. --- wcfsetup/install/files/lib/data/package/Package.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php index 05d191ea2a..8b1ffed6f8 100644 --- a/wcfsetup/install/files/lib/data/package/Package.class.php +++ b/wcfsetup/install/files/lib/data/package/Package.class.php @@ -535,10 +535,11 @@ class Package extends DatabaseObject { )); while ($row = $statement->fetchArray()) { $dependency = new Package(null, $row); + $dependencyDir = FileUtil::addTrailingSlash(FileUtil::getRealPath(WCF_DIR.$dependency->packageDir)); $prefix = strtoupper(Package::getAbbreviation($dependency->package)); - $file->write("// ".$dependency->packageID." vars\n"); - $file->write("// ".strtolower($prefix)."\n"); + $file->write("// ".$dependency->packageName." (packageID ".$dependency->packageID.")\n"); + $file->write("if (!defined('".$prefix."_DIR')) define('".$prefix."_DIR', ".($dependency->packageID == $package->packageID ? "dirname(__FILE__).'/'" : "'".$dependencyDir."'").");\n"); $file->write("if (!defined('".$prefix."_N')) define('".$prefix."_N', '".WCF_N."_".$dependency->instanceNo."');\n"); $file->write("\n"); } -- 2.20.1