--- block.inc	2007-03-17 00:56:32.000000000 +0100
+++ block.inc.new	2007-07-13 14:07:21.222811200 +0200
@@ -23,9 +23,9 @@ function panels_content_block($conf) {
   }
 
   // Test for block visibility
-  $result = db_query("SELECT pages, visibility FROM {blocks} WHERE module = '%s' AND delta = %d", $block->module, $block->delta);
+  $result = db_query(db_rewrite_sql("SELECT pages, visibility FROM {blocks} b WHERE module = '%s' AND delta = %d", 'blocks', 'module'), $block->module, $block->delta);
   $block_visibility = db_fetch_object($result);
-
+  
   if ($block_visibility && $block_visibility->pages) {
     if ($block_visibility->visibility < 2) {
       $path = drupal_get_path_alias($_GET['q']);
@@ -34,8 +34,10 @@ function panels_content_block($conf) {
     } else {
       $page_match = drupal_eval($block->pages);
     }
-  } else {
+  } elseif ($block_visibility) {
     $page_match = TRUE;
+  } else { 
+    $page_match = FALSE;
   }
 
   if ($page_match) {