FRBR : Correction d'un cas ou il est possible de charger une notice si sa clé alpha est vide

library/Class/FRBR/Link.php

@@ -144,16 +144,19 @@ class Class_FRBR_Link extends Storm_Model_Abstract {
 			return;
 
 		$attribute = '_' . $type .'_entity';
-		if (!$this->$attribute) {
+		if ($this->$attribute)
+			return $this->$attribute;
 
-			try {		
-				$key = $this->_extractKeyFromUrl($this->{'get'. ucfirst($type)}());
-			} catch(Zend_Uri_Exception $e) {
-				return $this->$attribute = null;
-			}
-
-			$this->$attribute = Class_Notice::getLoader()->getNoticeByClefAlpha($key);
+		try {		
+			$key = $this->_extractKeyFromUrl($this->{'get'. ucfirst($type)}());
+		} catch(Zend_Uri_Exception $e) {
+			return;
 		}
+
+		if (!$key)
+			return;
+
+		$this->$attribute = Class_Notice::getLoader()->getNoticeByClefAlpha($key);
 		return $this->$attribute;
 	}
 

tests/library/Class/FRBR/LinkTest.php

@@ -22,7 +22,7 @@
 class FRBR_LinkWrongAttributesTest extends Storm_Test_ModelTestCase {
 	public function setUp() {
 		parent::setUp();
-
+		
 		$this->link = Class_FRBR_Link::newInstanceWithId(34)
 			->setSource('zork')
 			->setTarget('http://localhost/notice/view/clef/TINTIN')
@@ -44,7 +44,7 @@ class FRBR_LinkWrongAttributesTest extends Storm_Test_ModelTestCase {
 
 	/** @test */
 	public function getTargetNoticeShouldReturnNullWithInvalidType() {
-		$this->assertEquals(null, $this->link->getTargetNotice());		
+		$this->assertEquals(null, $this->link->getTargetNotice());
 	}
 }