aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-02 10:45:21 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-02 10:45:21 +0000
commit28fe2df8934f4c18bc472cb8a4945184fe0cad93 (patch)
tree3381ae7d4ebeb7e268251b7dbfa82ea6aac78e77
parent366b25dd6651304525f227584f350caaaefc4b6c (diff)
downloadelgg-28fe2df8934f4c18bc472cb8a4945184fe0cad93.tar.gz
elgg-28fe2df8934f4c18bc472cb8a4945184fe0cad93.tar.bz2
Marcus Povey <marcus@dushka.co.uk>
* Entity type/ subtype functional git-svn-id: https://code.elgg.org/elgg/trunk@340 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/annotations.php4
-rw-r--r--engine/lib/metadata.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 26664757a..0a06b2afe 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -218,7 +218,7 @@
$entity_guid = (int)$entity_guid;
$entity_type = sanitise_string($entity_type);
- $entity_subtype = get_subtype_id($entity_subtype);
+ $entity_subtype = get_subtype_id($entity_type, $entity_subtype);
$name = get_metastring_id($name);
$value = get_metastring_id($value);
$owner_guid = (int)$owner_guid;
@@ -339,7 +339,7 @@
$sum = sanitise_string($sum);
$entity_guid = (int)$entity_id;
$entity_type = sanitise_string($entity_type);
- $entity_subtype = get_subtype_id($entity_subtype);
+ $entity_subtype = get_subtype_id($entity_type, $entity_subtype);
$name = get_metastring_id($name);
$access = get_access_list();
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 83336cd94..eb5096f3e 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -309,7 +309,7 @@
$meta_value = get_metastring_id($meta_value);
$entity_type = sanitise_string($entity_type);
- $entity_subtype = get_subtype_id($entity_subtype);
+ $entity_subtype = get_subtype_id($entity_type, $entity_subtype);
$limit = (int)$limit;
$offset = (int)$offset;
$order_by = sanitise_string($order_by);