Dropped APP_N entirely *woohoo*

diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php
index 5f8aaf559cbdec27ca70df504bf7704cfa800bfb..c90463f987a55218979f5d6f21ca0bf93aa4cf7d 100644 (file)
--- 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 4ab7639cc448825c29ba4a093bdc55475b4c7b3f..be39869d4ea60702940e99ba9ce49d3898e857ca 100644 (file)
--- 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