191c191,192
<     
---
>   
>   
196c197,209
<   $themed = theme($key, drupal_get_title(), $user, $data);
---
>   $has_context_layout = FALSE;
>   foreach (context_active_contexts() as $context) {
>     if($context->reactions['block']['layout']){
>       $has_context_layout = TRUE;
>     }  
>   }
>   
>   if($has_context_layout){
>     $themed = "";  
>   } 
>   else{
>     $themed = theme($key, drupal_get_title(), $user, $data);  
>   }
209,210c222,223
<   
<   if ( trim ($themed) == "" ) {
---
> 
>   if ( trim ($themed) == "" && !$has_context_layout ) {
223c236
< 
---
>   return $themed;