Index: extension/ezfind/search/plugins/ezsolr/ezsolr.php
===================================================================
--- extension/ezfind/search/plugins/ezsolr/ezsolr.php	(revision 2205)
+++ extension/ezfind/search/plugins/ezsolr/ezsolr.php	(working copy)
@@ -407,6 +407,25 @@
         eZDebug::createAccumulator( 'Search', 'eZ Find' );
         eZDebug::accumulatorStart( 'Search' );
 
+        $allowSearch = true;
+        if ( trim( $searchText ) == '' )
+        {
+            $ini =& eZINI::instance();
+            if ( $ini->variable( 'SearchSettings', 'AllowEmptySearch' ) != 'enabled' )
+                $allowSearch = false;
+            if ( isset( $params['AllowEmptySearch'] ) )
+                $allowSearch = $params['AllowEmptySearch'];
+        }
+        
+        if ( !$allowSearch )
+        {
+            eZDebug::accumulatorStop( 'Search' );
+            return array(
+                'SearchResult' => false,
+                'SearchCount' => 0,
+                'StopWordArray' => array(),
+                'SearchExtras' => new ezfSearchResultInfo( array( 'error' => ezi18n( 'ezfind', 'Empty searches not allowed' ) ) ) );
+        }
         eZDebug::createAccumulator( 'Query build', 'eZ Find' );
         eZDebug::accumulatorStart( 'Query build' );
         $queryBuilder = new ezfeZPSolrQueryBuilder();