wip #1003 @0.33

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