Merge lp:~sebastian-meyer/goobi-presentation/bug809874 into lp:goobi-presentation/1.0

[Sebastian Meyer]

Fix Bug #809874: Multi-volume works are not linked in table of contents

[Sebastian Meyer (sebastian-meyer)]

review: Approve

=== modified file 'dlf/common/class.tx_dlf_document.php'
--- dlf/common/class.tx_dlf_document.php	2011-08-02 17:38:33 +0000
+++ dlf/common/class.tx_dlf_document.php	2011-08-10 15:46:09 +0000
@@ -451,6 +451,12 @@
 
 				}
 
+			// Is this the toplevel structure?
+			} elseif ($_details['id'] == $this->getToplevelId()) {
+
+				// Yes. Point to itself.
+				$_details['points'] = 1;
+
 			}
 
 			// Keep for later usage.

=== modified file 'dlf/plugins/toc/class.tx_dlf_toc.php'
--- dlf/plugins/toc/class.tx_dlf_toc.php	2011-08-02 17:38:33 +0000
+++ dlf/plugins/toc/class.tx_dlf_toc.php	2011-08-10 15:46:09 +0000
@@ -95,10 +95,6 @@
 
 			}
 
-		} elseif (!empty($entry['points']['doc'])) {
-
-			$entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(array ('id' => $entry['points']['doc'], 'page' => 1), TRUE, FALSE, $this->conf['targetPid']);
-
 		} else {
 
 			$entryArray['doNotLinkIt'] = 1;
@@ -282,7 +278,7 @@
 
 			if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
 
-				$menuArray[0]['ITEM_STATE'] .= 'IFSUB';
+				$menuArray[0]['ITEM_STATE'] = 'CURIFSUB';
 
 				$menuArray[0]['_SUB_MENU'] = array ();