From 510cb88303542ed87c861780f5863fccda7d233d Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 7 Dec 2012 15:26:07 +0100 Subject: [PATCH] Dropped APP_N entirely *woohoo* --- wcfsetup/install/files/lib/data/package/Package.class.php | 3 --- .../package/plugin/SQLPackageInstallationPlugin.class.php | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php index 5f8aaf559c..c90463f987 100644 --- a/wcfsetup/install/files/lib/data/package/Package.class.php +++ b/wcfsetup/install/files/lib/data/package/Package.class.php @@ -424,9 +424,6 @@ class Package extends DatabaseObject { $file->write("if (!defined('".$prefix."_DIR')) define('".$prefix."_DIR', dirname(__FILE__).'/');\n"); $file->write("if (!defined('RELATIVE_".$prefix."_DIR')) define('RELATIVE_".$prefix."_DIR', '');\n"); $file->write("\n"); - $file->write("\n// using ".$prefix."_N is deprecated, please use WCF_N instead!"); - $file->write("if (!defined('".$prefix."_N')) define('".$prefix."_N', '".WCF_N."');\n"); - $file->write("\n"); // write general information $file->write("// general info\n"); diff --git a/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php index 4ab7639cc4..be39869d4e 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/SQLPackageInstallationPlugin.class.php @@ -38,10 +38,10 @@ class SQLPackageInstallationPlugin extends AbstractPackageInstallationPlugin { if ($package->isApplication == 1) { // package is application $packageAbbr = Package::getAbbreviation($package->package); - $tablePrefix = WCF_N; + $tablePrefix = WCF_N.'_'; // Replace the variable xyz1_1 with $tablePrefix in the table names. - $queries = StringUtil::replace($packageAbbr.'1_1_', $packageAbbr.$tablePrefix, $queries); + $queries = StringUtil::replace($packageAbbr.'1_', $packageAbbr.$tablePrefix, $queries); } // replace wcf1_ with the actual WCF_N value -- 2.20.1