From 517d262f59179cd29036b4280a6c5ed5c3a87f33 Mon Sep 17 00:00:00 2001 From: icewing Date: Tue, 11 Mar 2008 16:43:21 +0000 Subject: Marcus Povey * Removed subtypes until problems with tag system are sorted out. git-svn-id: https://code.elgg.org/elgg/trunk@167 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/annotations.php | 2 +- engine/lib/metadata.php | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php index 21f62f715..bbafd9bc3 100644 --- a/engine/lib/annotations.php +++ b/engine/lib/annotations.php @@ -143,7 +143,7 @@ * @param int $limit * @param int $offset */ - function get_annotations($object_id = 0, $object_type = "", $name = "", $value = "", $owner_id = 0, $object_subtype = "", $order_by = "created desc", $limit = 10, $offset = 0) + function get_annotations($object_id = 0, $object_type = "", $name = "", $value = "", $owner_id = 0, $order_by = "created desc", $limit = 10, $offset = 0) { global $CONFIG; diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php index 0a82ec4dd..ee356b9f4 100644 --- a/engine/lib/metadata.php +++ b/engine/lib/metadata.php @@ -248,7 +248,7 @@ * @param int $offset * @return array of ElggMetadata */ - function get_metadatas($object_id = 0, $object_type = "", $name = "", $value = "", $value_type = "", $owner_id = 0, $object_subtype = "", $order_by = "created desc", $limit = 10, $offset = 0) + function get_metadatas($object_id = 0, $object_type = "", $name = "", $value = "", $value_type = "", $owner_id = 0, $order_by = "created desc", $limit = 10, $offset = 0) { global $CONFIG; @@ -257,7 +257,6 @@ $name = sanitise_string(trim($name)); $value = sanitise_string(trim($value)); $value_type = sanitise_string(trim($value_type)); - $object_subtype = get_object_type_id($object_subtype); $owner_id = (int)$owner_id; $order_by = sanitise_string($order_by); @@ -315,9 +314,9 @@ * @param int $offset * @return mixed Array of objects or false. */ - function get_objects_from_metadatas($object_id = 0, $object_type = "", $name = "", $value = "", $value_type = "", $owner_id = 0, $object_subtype = "", $order_by = "created desc", $limit = 10, $offset = 0) + function get_objects_from_metadatas($object_id = 0, $object_type = "", $name = "", $value = "", $value_type = "", $owner_id = 0, $order_by = "created desc", $limit = 10, $offset = 0) { - $results = get_metadatas($object_id, $object_type, $name, $value, $value_type, $owner_id, $object_subtype, $order_by, $limit, $offset); + $results = get_metadatas($object_id, $object_type, $name, $value, $value_type, $owner_id, $order_by, $limit, $offset); $objects = false; if ($results) -- cgit v1.2.3