Merge branch 'master' into dev-searchcommons

mgoldbeck · mgoldbeck · commit 5951598c3784 · 2014-07-14T17:24:09.000+02:00
diff --git a/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php b/Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php
@@ -138,7 +138,7 @@ public function getIndex() {
 	public function indexNode(Node $node, $targetWorkspaceName = NULL) {
 		$contextPath = $node->getContextPath();
 		if ($targetWorkspaceName !== NULL) {
-			$contextPath = str_replace($node->getWorkspace()->getName(), $targetWorkspaceName, $contextPath);
+			$contextPath = str_replace($node->getContext()->getWorkspace()->getName(), $targetWorkspaceName, $contextPath);
 		}
 		$contextPathHash = sha1($contextPath);
 		$nodeType = $node->getNodeType();

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function getIndex() {`
`138`	`138`	`public function indexNode(Node $node, $targetWorkspaceName = NULL) {`
`139`	`139`	`$contextPath = $node->getContextPath();`
`140`	`140`	`if ($targetWorkspaceName !== NULL) {`
`141`		`- $contextPath = str_replace($node->getWorkspace()->getName(), $targetWorkspaceName, $contextPath);`
	`141`	`+ $contextPath = str_replace($node->getContext()->getWorkspace()->getName(), $targetWorkspaceName, $contextPath);`
`142`	`142`	`}`
`143`	`143`	`$contextPathHash = sha1($contextPath);`
`144`	`144`	`$nodeType = $node->getNodeType();`