Ignore:
Timestamp:
Oct 22, 2010, 10:03:09 AM (13 years ago)
Author:
grum
Message:

fix bug:1948

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/gally/gally-default/admin/GallyDefault.class.inc.php

    r6752 r7337  
    5252    $this->setDirectoryPrivate('templates.local', $templateDirectory);
    5353
     54
    5455    $this->setDirectoryPrivate('conf.parent', dirname(dirname(__FILE__)).'/conf');
    5556    $this->setDirectoryPrivate('conf.local', $confDirectory);
     
    8990    $this->config = new Conf();
    9091    $this->config->setFileName($this->directories['conf.parent']."/default.conf");
     92    $this->config->read();
     93    $this->config->setFileName($this->directories['conf.local']."/default.conf");
    9194    $this->config->read();
    9295    $this->config->setFileName(PHPWG_ROOT_PATH."local/themes/".basename(dirname($this->directories['conf.local']))."/conf/local.conf");
Note: See TracChangeset for help on using the changeset viewer.