Fixed EZP-19673: search results contain link to hidden nodes

Make sure the main node is returned if the user can read it and if it
matches the visibility requirement.
(cherry picked from commit c81478d)

classes/ezfezpsolrquerybuilder.php

@@ -453,7 +453,8 @@ public function buildSearch( $searchText, $params = array(), $searchTypes = arra
                 eZSolr::getMetaFieldName( 'id' ) . ' ' . eZSolr::getMetaFieldName( 'main_node_id' ) . ' ' .
                 eZSolr::getMetaFieldName( 'language_code' ) . ' ' . eZSolr::getMetaFieldName( 'name' ) .
                 ' score ' . eZSolr::getMetaFieldName( 'published' ) . ' ' . eZSolr::getMetaFieldName( 'path_string' ) . ' ' .
-                eZSolr::getMetaFieldName( 'is_invisible' ) . ' ' . implode( ' ', $extraFieldsToReturn );
+                eZSolr::getMetaFieldName( 'main_path_string' ) . ' ' . eZSolr::getMetaFieldName( 'is_invisible' ) . ' ' .
+                implode( ' ', $extraFieldsToReturn );
 
         if ( ! $asObjects )
         {

search/plugins/ezsolr/ezsolr.php

@@ -335,6 +335,23 @@ protected function getUrlAlias( $doc )
     protected function getNodeID( $doc )
     {
         $docPathStrings = $doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'path_string' )];
+        $docVisibilities = $doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'is_invisible' )];
+        if ( count( $docPathStrings ) > 1 )
+        {
+            // reordering the path strings and the associated visibilities so
+            // that the main node path string and the main node visibility are
+            // in the first position.
+            $mainNodeIdx = array_search(
+                $doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'main_path_string' )],
+                $docPathStrings
+            );
+            if ( $mainNodeIdx != 0 )
+            {
+                array_unshift( $docVisibilities, $docVisibilities[$mainNodeIdx] );
+                array_unshift( $docPathStrings, $docPathStrings[$mainNodeIdx] );
+                unset( $docVisibilities[$mainNodeIdx], $docPathStrings[$mainNodeIdx] );
+            }
+        }
         $locationFilter = isset( $this->postSearchProcessingData['subtree_array'] ) ? $this->postSearchProcessingData['subtree_array'] : array();
         $subtreeLimitations = isset( $this->postSearchProcessingData['subtree_limitations'] ) ? $this->postSearchProcessingData['subtree_limitations'] : array();
         $validSubtreeArray = $this->getValidPathStringsByLimitation(
@@ -365,10 +382,7 @@ protected function getNodeID( $doc )
             {
                 if ( isset( $validSubtrees[$path] ) )
                 {
-                    if (
-                        $ignoreVisibility ||
-                        !$doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'is_invisible' )][$k]
-                    )
+                    if ( $ignoreVisibility || !$docVisibilities[$k] )
                     {
                         $nodeArray = explode( '/', rtrim( $path, '/' ) );
                         return (int)array_pop( $nodeArray );
@@ -397,10 +411,7 @@ protected function getNodeID( $doc )
             }
             foreach ( $docPathStrings as $k => $path )
             {
-                if (
-                    $ignoreVisibility ||
-                    !$doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'is_invisible' )][$k]
-                )
+                if ( $ignoreVisibility || !$docVisibilities[$k] )
                 {
                     $nodeArray = explode( '/', rtrim( $path, '/' ) );
                     return (int)array_pop( $nodeArray );