Peter M. Groen / knowledgetree

Commit e12f2fdd06f75096076b43658c5b2824eb38ca26

Authored by nbm
1 parent 57fc5901

Fix the breadcrumbs (again!). Use array_merge, as the '+' array 

operator doesn't do what you'd expect...


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4206 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 8 additions and 3 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/view.php
  View file @e12f2fd
@@ -64,9 +64,14 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -64,9 +64,14 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
64 $this->oPage->addError('You are not allowed to view this document'); 64 $this->oPage->addError('You are not allowed to view this document');
65 return $this->do_error(); 65 return $this->do_error();
66 } 66 }
  67 +
  68 + $aOptions = array(
  69 + "documentaction" => "viewDocument",
  70 + "folderaction" => "browse",
  71 + );
67 72
68 $this->oDocument =& $oDocument; 73 $this->oDocument =& $oDocument;
69 - $this->aBreadcrumbs += KTBrowseUtil::breadcrumbsForDocument($oDocument); 74 + $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument, $aOptions));
70 $this->oPage->setBreadcrumbDetails("document details"); 75 $this->oPage->setBreadcrumbDetails("document details");
71 $this->addPortlets("Document Details"); 76 $this->addPortlets("Document Details");
72 77
@@ -144,7 +149,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -144,7 +149,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
144 // fixme check perms 149 // fixme check perms
145 150
146 $this->oDocument =& $oDocument; 151 $this->oDocument =& $oDocument;
147 - $this->aBreadcrumbs += KTBrowseUtil::breadcrumbsForDocument($oDocument); 152 + $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument));
148 $this->oPage->setBreadcrumbDetails("history"); 153 $this->oPage->setBreadcrumbDetails("history");
149 $this->addPortlets("History"); 154 $this->addPortlets("History");
150 155
@@ -205,7 +210,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { @@ -205,7 +210,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
205 return $this->do_error(); 210 return $this->do_error();
206 } 211 }
207 $this->oDocument =& $oDocument; 212 $this->oDocument =& $oDocument;
208 - $this->aBreadcrumbs += KTBrowseUtil::breadcrumbsForDocument($oDocument); 213 + $this->aBreadcrumbs = array_merge($this->aBreadcrumbs, KTBrowseUtil::breadcrumbsForDocument($oDocument));
209 $this->oPage->setBreadcrumbDetails("compare versions"); 214 $this->oPage->setBreadcrumbDetails("compare versions");
210 215
211 $comparison_version = KTUtil::arrayGet($_REQUEST, 'fComparisonVersion'); 216 $comparison_version = KTUtil::arrayGet($_REQUEST, 'fComparisonVersion');