diff options
| author | Sem <sembrestels@riseup.net> | 2014-01-22 04:05:47 +0100 | 
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2014-01-22 04:05:47 +0100 | 
| commit | 68614b769f4ae4f28c3f395f47b68baba7c48c64 (patch) | |
| tree | 2c5a744a3859d27883f92b72aef9cf81f1a947d0 /engine/classes/ElggRelationship.php | |
| parent | 69e2d8c5d8732042c9319aef1fdea45a82b63e42 (diff) | |
| parent | c0295c275d6edbca6c6c8bb51dc199150d0d5fc3 (diff) | |
| download | elgg-68614b769f4ae4f28c3f395f47b68baba7c48c64.tar.gz elgg-68614b769f4ae4f28c3f395f47b68baba7c48c64.tar.bz2  | |
Merge branch 'release/1.8.1'
Diffstat (limited to 'engine/classes/ElggRelationship.php')
| -rw-r--r-- | engine/classes/ElggRelationship.php | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/engine/classes/ElggRelationship.php b/engine/classes/ElggRelationship.php index efc0f7eff..d2e88882a 100644 --- a/engine/classes/ElggRelationship.php +++ b/engine/classes/ElggRelationship.php @@ -71,6 +71,7 @@ class ElggRelationship extends ElggData implements  	 * Save the relationship  	 *  	 * @return int the relationship id +	 * @throws IOException  	 */  	public function save() {  		if ($this->id > 0) { @@ -145,7 +146,7 @@ class ElggRelationship extends ElggData implements  	 * @param ODD $data ODD data  	 * @return bool -	 * @throws ImportException +	 * @throws ImportException|InvalidParameterException  	 */  	public function import(ODD $data) {  		if (!($data instanceof ODDRelationship)) { @@ -179,6 +180,8 @@ class ElggRelationship extends ElggData implements  				return true;  			}  		} + +		return false;  	}  	// SYSTEM LOG INTERFACE ////////////////////////////////////////////////////////////  | 
