aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/entities.php8
-rw-r--r--engine/lib/objects.php7
-rw-r--r--engine/lib/sites.php3
-rw-r--r--engine/lib/users.php3
4 files changed, 13 insertions, 8 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 4a588368d..60ad89733 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -273,8 +273,8 @@
*/
protected function load($guid)
{
- $row = get_entity_as_row($guid);
-
+ $row = get_entity_as_row($guid);
+
if ($row)
{
// Create the array if necessary - all subclasses should test before creating
@@ -608,7 +608,9 @@
$query .= " $w and ";
$query .= " (access_id in {$access} or (access_id = 0 and owner_guid = {$_SESSION['guid']}))"; // Add access controls
$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
- $dt = get_data($query, "entity_row_to_elggstar");
+
+ $dt = get_data($query, "entity_row_to_elggstar");
+
return $dt;
}
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 0a8dffc65..ff8ebd558 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -44,14 +44,15 @@
*/
function __construct($guid = null)
{
- $this->initialise_attributes();
+ $this->initialise_attributes();
if (!empty($guid))
{
// Is $guid is a DB row - either a entity row, or a object table row.
if ($guid instanceof stdClass) {
// Load the rest
- $this->load($guid->guid);
+ if (!$this->load($guid->guid))
+ throw new IOException("Failed to load new ElggObject from GUID:$guid->guid");
}
// Is $guid is an ElggObject? Use a copy constructor
@@ -100,7 +101,7 @@
$objarray = (array) $row;
foreach($objarray as $key => $value)
$this->attributes[$key] = $value;
-
+
return true;
}
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index 9f2ae442f..2d9f04f1c 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -51,7 +51,8 @@
// Is $guid is a DB row - either a entity row, or a site table row.
if ($guid instanceof stdClass) {
// Load the rest
- $this->load($guid->guid);
+ if (!$this->load($guid->guid))
+ throw new IOException("Failed to load new ElggSite from GUID:$guid->guid");
}
// Is $guid is an ElggSite? Use a copy constructor
diff --git a/engine/lib/users.php b/engine/lib/users.php
index cc293c411..edf2974c1 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -54,7 +54,8 @@
// Is $guid is a DB row - either a entity row, or a user table row.
if ($guid instanceof stdClass) {
// Load the rest
- $this->load($guid->guid);
+ if (!$this->load($guid->guid))
+ throw new IOException("Failed to load new ElggUser from GUID:$guid->guid");
}
// See if this is a username