Object type definitions are now globally unique

Fixes #971

diff --git a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
index 2347b385ad74d3d12b7929ff0d540fb5b90cb4f4..0af7ed328c8df988af08451e9c5bba1fc11b17e9 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
@@ -56,12 +56,8 @@ class ObjectTypeDefinitionPackageInstallationPlugin extends AbstractXMLPackageIn
        protected function findExistingItem(array $data) {
                $sql = "SELECT  *
                        FROM    wcf".WCF_N."_".$this->tableName."
-                       WHERE   definitionName = ?
-                               AND packageID = ?";
-               $parameters = array(
-                       $data['definitionName'],
-                       $this->installation->getPackageID()
-               );
+                       WHERE   definitionName = ?";
+               $parameters = array($data['definitionName']);
                
                return array(
                        'sql' => $sql,

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 218c6a056f5628a21e9642d48e175700708d8955..6c12e15dba58c38045f701a5b2836dedc14d94fd 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -265,7 +265,7 @@ CREATE TABLE wcf1_object_type_definition (
        packageID INT(10) NOT NULL,
        interfaceName VARCHAR(255) NOT NULL DEFAULT '',
        categoryName VARCHAR(80) NOT NULL DEFAULT '',
-       UNIQUE KEY definitionName (definitionName, packageID)
+       UNIQUE KEY definitionName (definitionName)
 );
 
 DROP TABLE IF EXISTS wcf1_option;