From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 19 Oct 2011 13:47:56 +0000 (+0200)
Subject: Fixed some issues with object type pips
X-Git-Tag: 2.0.0_Beta_1~1679
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b05cd8c59cce08aee412013404bff29bdb98ab28;p=GitHub%2FWoltLab%2FWCF.git

Fixed some issues with object type pips
---

diff --git a/com.woltlab.wcf/packageInstallationPlugin.xml b/com.woltlab.wcf/packageInstallationPlugin.xml
index 9deed6ac63..f3cb59da1e 100644
--- a/com.woltlab.wcf/packageInstallationPlugin.xml
+++ b/com.woltlab.wcf/packageInstallationPlugin.xml
@@ -11,7 +11,7 @@
 		<pip name="file">wcf\system\package\plugin\FilePackageInstallationPlugin</pip>
 		<pip name="language">wcf\system\package\plugin\LanguagePackageInstallationPlugin</pip>
 		<pip name="objectType">wcf\system\package\plugin\ObjectTypePackageInstallationPlugin</pip>
-		<pip name="objectTypeDefinition">wcf\system\package\plugin\ObjectTypeDefinitionInstallationPlugin</pip>
+		<pip name="objectTypeDefinition">wcf\system\package\plugin\ObjectTypeDefinitionPackageInstallationPlugin</pip>
 		<pip name="option">wcf\system\package\plugin\OptionPackageInstallationPlugin</pip>
 		<pip name="pageMenu">wcf\system\package\plugin\PageMenuPackageInstallationPlugin</pip>
 		<pip name="script">wcf\system\package\plugin\ScriptPackageInstallationPlugin</pip>
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 5ae27eb0c8..d350ec3f9a 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php
@@ -50,7 +50,7 @@ class ObjectTypeDefinitionPackageInstallationPlugin extends AbstractXMLPackageIn
 	protected function prepareImport(array $data) {
 		return array(
 			'interfaceName' => (isset($data['elements']['interfacename']) ? $data['elements']['interfacename'] : ''),
-			'definitionName' => $data['attributes']['name']
+			'definitionName' => $data['elements']['name']
 		);
 	}
 	
diff --git a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
index f74e728138..d82c43c066 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php
@@ -37,7 +37,7 @@ class ObjectTypePackageInstallationPlugin extends AbstractXMLPackageInstallation
 	 */
 	protected function getDefinitionID($definitionName) {
 		// get object type id
-		$sql = "SELECT		notification_object_type.definitionID
+		$sql = "SELECT		object_type_definition.definitionID
 			FROM		wcf".WCF_N."_package_dependency package_dependency,
 					wcf".WCF_N."_object_type_definition object_type_definition
 			WHERE		object_type_definition.packageID = package_dependency.dependency
@@ -57,7 +57,7 @@ class ObjectTypePackageInstallationPlugin extends AbstractXMLPackageInstallation
 	protected function handleDelete(array $items) {
 		$sql = "DELETE FROM	wcf".WCF_N."_".$this->tableName."
 			WHERE		objectType = ?
-					definitionID = ?
+					AND definitionID = ?
 					AND packageID = ?";
 		$statement = WCF::getDB()->prepareStatement($sql);
 		foreach ($items as $item) {
@@ -75,7 +75,7 @@ class ObjectTypePackageInstallationPlugin extends AbstractXMLPackageInstallation
 	protected function prepareImport(array $data) {
 		return array(
 			'definitionID' => $this->getDefinitionID($data['elements']['definitionname']),
-			'objectType' => $data['attributes']['name'],
+			'objectType' => $data['elements']['name'],
 			'className' => (isset($data['elements']['classname']) ? $data['elements']['classname'] : ''),
 			'additionalData' => serialize(isset($data['elements']['additionaldata']) ? $data['elements']['additionaldata'] : array())
 		);
@@ -88,7 +88,7 @@ class ObjectTypePackageInstallationPlugin extends AbstractXMLPackageInstallation
 		$sql = "SELECT	*
 			FROM	wcf".WCF_N."_".$this->tableName."
 			WHERE	objectType = ?
-				definitionID = ?
+				AND definitionID = ?
 				AND packageID = ?";
 		$parameters = array(
 			$data['objectType'],