/[drupal]/contributions/modules/spaces/spaces.module
ViewVC logotype

Diff of /contributions/modules/spaces/spaces.module

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

revision 1.25.4.33.2.28, Sat Sep 5 21:56:45 2009 UTC revision 1.25.4.33.2.29, Sun Sep 6 17:09:18 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: spaces.module,v 1.25.4.33.2.27 2009/08/13 14:55:33 yhahn Exp $  // $Id: spaces.module,v 1.25.4.33.2.28 2009/09/05 21:56:45 yhahn Exp $
3    
4  define('SPACES_FEATURE_DISABLED', 0);  define('SPACES_FEATURE_DISABLED', 0);
5    
# Line 591  function spaces_load($type, $sid = NULL, Line 591  function spaces_load($type, $sid = NULL,
591        $space->customizer = $row ? unserialize($row->customizer) : array();        $space->customizer = $row ? unserialize($row->customizer) : array();
592    
593        // Enforce preset or use default if not found        // Enforce preset or use default if not found
594          $valid_presets = spaces_presets($type);
595        $default_presets = variable_get('spaces_default_presets', array());        $default_presets = variable_get('spaces_default_presets', array());
596        if ($row) {        if ($row && isset($valid_presets[$row->preset])) {
597          $space->preset = $row->preset;          $space->preset = $row->preset;
598        }        }
599        else if (empty($space->preset) && isset($default_presets[$type])) {        else if (isset($default_presets[$type])) {
600          $space->preset = $default_presets[$type];          $space->preset = $default_presets[$type];
601        }        }
602        if (!empty($space->preset)) {        if (!empty($space->preset)) {
Legend:
Removed from v.1.25.4.33.2.28  
changed lines
  Added in v.1.25.4.33.2.29
  ViewVC Help
Powered by ViewVC 1.1.2