aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-08 23:28:42 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-08 23:28:42 +0000
commita86dd9c535dba4ff5985744e24c42db78d274213 (patch)
treeb769327614f97eff352634aef1d23e6fa5e71018
parentc266f415f074760e97c33a992fcbe6ab421a50ed (diff)
downloadelgg-a86dd9c535dba4ff5985744e24c42db78d274213.tar.gz
elgg-a86dd9c535dba4ff5985744e24c42db78d274213.tar.bz2
Marcus Povey <marcus@dushka.co.uk>
* BUGFIX: Moved shortcut so that subtype of "" doesn't cause fail. git-svn-id: https://code.elgg.org/elgg/trunk@636 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/entities.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 480a08b66..a2d3bf48e 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -826,11 +826,11 @@
{
global $CONFIG;
+ if ($subtype === false || $subtype === null || $subtype === 0)
+ return false;
+
$type = sanitise_string($type);
$subtype = get_subtype_id($type, $subtype);
-
- if ($subtype === false || $subtype === null || $subtype === 0)
- return false;
$order_by = sanitise_string($order_by);
$limit = (int)$limit;