aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-09-11 17:01:18 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-09-11 17:01:18 +0000
commitdd354e7b0f75e59ed3be40dc7d7a3a8262213ccb (patch)
treece0c37f0a5ee6b21ca5db2acb4954b5c14f76952 /engine
parentf4282d4b7a925802efb511af6362e999438891f6 (diff)
downloadelgg-dd354e7b0f75e59ed3be40dc7d7a3a8262213ccb.tar.gz
elgg-dd354e7b0f75e59ed3be40dc7d7a3a8262213ccb.tar.bz2
Merged get_entities() is_numeric() fix to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6925 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/entities.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 2ba762c2c..f2ff5108c 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -531,6 +531,11 @@ function entity_row_to_elggstar($row) {
function get_entity($guid) {
static $newentity_cache;
$new_entity = false;
+
+ if (!is_numeric($guid)) {
+ return FALSE;
+ }
+
if ((!$newentity_cache) && (is_memcache_available())) {
$newentity_cache = new ElggMemcache('new_entity_cache');
}