diff options
Diffstat (limited to 'engine/lib/objects.php')
| -rw-r--r-- | engine/lib/objects.php | 7 | 
1 files changed, 4 insertions, 3 deletions
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;
  		}
  | 
