/[drupal]/contributions/modules/context/context.core.inc
ViewVC logotype

Diff of /contributions/modules/context/context.core.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.3.2.7, Tue May 26 15:45:21 2009 UTC revision 1.1.2.3.2.8, Mon Jun 1 06:22:20 2009 UTC
# Line 365  function context_block_list($region) { Line 365  function context_block_list($region) {
365        if (!empty($context_blocks[$bid])) {        if (!empty($context_blocks[$bid])) {
366          $block->region = $context_blocks[$bid]->region;          $block->region = $context_blocks[$bid]->region;
367          $block->weight = $context_blocks[$bid]->weight;          $block->weight = $context_blocks[$bid]->weight;
368            unset($context_blocks[$bid]);
369          $enabled = TRUE;          $enabled = TRUE;
370        }        }
371        else if (!$block->status) {        else if (!$block->status) {
# Line 415  function context_block_list($region) { Line 416  function context_block_list($region) {
416        $block->page_match = $page_match;        $block->page_match = $page_match;
417        $blocks[$block->region]["{$block->module}_{$block->delta}"] = $block;        $blocks[$block->region]["{$block->module}_{$block->delta}"] = $block;
418      }      }
419        // It's possible that there are still some leftover blocks in the enabled contexts.
420        // Add these in as well.
421        if (!empty($context_blocks)) {
422          foreach ($context_blocks as $block) {
423            $block = (object) $block;
424            $block->status = 1;
425            $block->enabled = TRUE;
426            $block->page_match = TRUE;
427            $blocks[$block->region]["{$block->module}_{$block->delta}"] = $block;
428          }
429        }
430    
431      // Sort blocks -- we must do this here since blocks provided via      // Sort blocks -- we must do this here since blocks provided via
432      // context may have overridden or altered weights.      // context may have overridden or altered weights.
Legend:
Removed from v.1.1.2.3.2.7  
changed lines
  Added in v.1.1.2.3.2.8
  ViewVC Help
Powered by ViewVC 1.1.2