From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 1 Feb 2017 14:52:17 +0000 (+0000)
Subject: wip #1003 @0.33
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=54370adff7e987d67fb86b8ff06b9898efba59d3;p=fluidbook-v3.git

wip #1003 @0.33
---

diff --git a/framework/application/models/Reference.php b/framework/application/models/Reference.php
index 19296a8..24a43a5 100644
--- a/framework/application/models/Reference.php
+++ b/framework/application/models/Reference.php
@@ -57,19 +57,19 @@ class Fluidbook_Model_Reference extends CubeIT_Model_Data_Table {
 	}
 
 	protected function _getFinalURL($url, $locale = null) {
-		$prepend = '';
+		$append = '';
 		if ($url) {
 			if (substr($url, 0, 1) == '#') {
-				$prepend = $url;
+				$append = $url;
 			} else {
 				return $url;
 			}
 
 		}
 		if (null === $locale) {
-			return $this->_getLocalReference($this->getFluidbookId()) . $prepend;
+			return $this->_getLocalReference($this->getFluidbookId()) . $append;
 		} else {
-			return $this->_getLocalReference($this->getFluidbookId()->$locale) . $prepend;
+			return $this->_getLocalReference($this->getFluidbookId()->$locale) . $append;
 		}
 	}
 
@@ -81,7 +81,7 @@ class Fluidbook_Model_Reference extends CubeIT_Model_Data_Table {
 				continue;
 			}
 			$e = explode('-', $dir->getBasename(), 2);
-			if ($e[0] == $id) {
+			if ($e[0] == $id && $e[1] != '') {
 				$d = $dir->getBasename();
 				break;
 			}
@@ -100,6 +100,7 @@ class Fluidbook_Model_Reference extends CubeIT_Model_Data_Table {
 
 	public function getFinalUrl() {
 		$res = parent::getUrl();
+
 		$res = $this->_setFrDefault($res);
 
 		if (!is_array($res) && !is_object($res)) {