Fixed issue 19471: Hidden objects not found in admin interface (manua…

…lly merged from 2.6 branch)
ezsystems · Aug 10, 2012 · f986c78 · f986c78
1 parent 8e941e7
commit f986c78
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/classes/ezfezpsolrquerybuilder.php b/classes/ezfezpsolrquerybuilder.php
@@ -1491,7 +1491,7 @@ protected function getContentClassFilterQuery( $contentClassIdent )
      * @param boolean $ignoreVisibility Set to true for the visibility to be ignored
      * @return string Lucene/Solr query string which can be used as filter query for Solr
      */
-    protected function policyLimitationFilterQuery( $limitation = null, $ignoreVisibility = false )
+    protected function policyLimitationFilterQuery( $limitation = null, $ignoreVisibility = null )
     {
         $filterQuery = false;
         $policies = array();
@@ -1680,8 +1680,8 @@ protected function policyLimitationFilterQuery( $limitation = null, $ignoreVisib
             $filterQuery = '(' . eZSolr::getMetaFieldName( 'installation_id' ) . ':' . eZSolr::installationID() . $anonymousPart . ')';
         }
 
-        // Add visibility condition
-        if ( !$ignoreVisibility )
+        // Add ignore visibility condition, either explicitely set to boolean false or not specified
+        if ( $ignoreVisibility === false || $ignoreVisibility === null )
         {
             $filterQuery .= ' AND ' . eZSolr::getMetaFieldName( 'is_invisible' ) . ':false';
         }

diff --git a/classes/ezfmodulefunctioncollection.php b/classes/ezfmodulefunctioncollection.php
@@ -105,7 +105,7 @@ public function getFilterParameters()
      */
     public function search( $query, $offset = 0, $limit = 10, $facets = null,
                             $filters = null, $sortBy = null, $classID = null, $sectionID = null,
-                            $subtreeArray = null, $ignoreVisibility = false, $limitation = null, $asObjects = true, $spellCheck = null, $boostFunctions = null, $queryHandler = 'ezpublish',
+                            $subtreeArray = null, $ignoreVisibility = null, $limitation = null, $asObjects = true, $spellCheck = null, $boostFunctions = null, $queryHandler = 'ezpublish',
                             $enableElevation = true, $forceElevation = false, $publishDate = null, $distributedSearch = null, $fieldsToReturn = null, $searchResultClustering = null )
     {
         $solrSearch = new eZSolr();

diff --git a/modules/ezfind/function_definition.php b/modules/ezfind/function_definition.php
@@ -75,7 +75,7 @@
                                                         array( 'name' => 'ignore_visibility',
                                                                'type' => 'bool',
                                                                'required' => false,
-                                                               'default' => false ),
+                                                               'default' => null ),
                                                         array( 'name' => 'limitation',
                                                                'type' => 'array',
                                                                'required' => false,