From f28efd50ad32698278494c2d476c69f2a2cb6b9c Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Mon, 16 Jan 2012 19:29:07 +0100 Subject: [PATCH] Fixed some small issues --- wcfsetup/install/files/js/WCF.js | 4 ++-- .../files/lib/data/AbstractDatabaseObjectAction.class.php | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index b3227b4b0e..a6e9e2236c 100644 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -3226,10 +3226,10 @@ WCF.Search.Base = Class.extend({ var $listItem = $(event.currentTarget); // notify callback - this._callback($listItem.data()); + var $clearSearchInput = this._callback($listItem.data()); // close list and revert input - this._clearList(true); + this._clearList($clearSearchInput); }, /** diff --git a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php index 85faa1b70e..6a2bb9a27e 100644 --- a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php +++ b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php @@ -105,11 +105,8 @@ abstract class AbstractDatabaseObjectAction implements IDatabaseObjectAction { $this->objectIDs[] = $object->$indexName; } - else if (is_int($object)) { - $this->objectIDs[] = $object; - } else { - throw new SystemException('invalid value of parameter objects given'); + $this->objectIDs[] = $object; } } -- 2.20.1