Merge pull request #12 from Stratosgear/master

Catch a null pointer exception
phpnode · Jun 11, 2012 · 745deb3 · 745deb3
2 parents d5f02c7 + 55fd842
commit 745deb3
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/ASolrSearchable.php b/ASolrSearchable.php
@@ -168,8 +168,7 @@ public function getSolrDocument($refresh = false)
 			foreach($this->resolveAttributes() as $attribute => $item) {
 				list($object, $property) = $item;
 				$resolvedAttributeName = $this->resolveAttributeName($attribute);
-				if (is_object($object))
-					$this->_solrDocument->{$resolvedAttributeName} = $object->{$property};
+				$this->_solrDocument->{$resolvedAttributeName} = isset($object) ? $object->{$property} : null;
 			}
 		}
 		return $this->_solrDocument;
@@ -187,8 +186,7 @@ public function index() {
 		$this->_oldAttributes = array();
 		foreach($this->resolveAttributes() as $key => $item) {
 			list($object, $property) = $item;
-			if (is_object($object))
-				$this->_oldAttributes[$key] = $object->{$property};
+			$this->_oldAttributes[$key] = isset($object) ? $object->{$property} : null;
 		}
 		return true;
 	}