Ignore:
Timestamp:
Jan 17, 2011, 7:48:13 PM (13 years ago)
Author:
plg
Message:

feature 2112 added: ability to set an additional local directory
$conflocal_dir_site in local/config/multisite.inc.php

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/common.inc.php

    r8247 r8722  
    7171$filter = array();
    7272
    73 @include(PHPWG_ROOT_PATH .'local/config/database.inc.php');
     73if (is_file(PHPWG_ROOT_PATH .'local/config/multisite.inc.php'))
     74{
     75  include(PHPWG_ROOT_PATH .'local/config/multisite.inc.php');
     76  define('PWG_LOCAL_DIR', $conf['local_dir_site']);
     77}
     78else
     79{
     80  define('PWG_LOCAL_DIR', 'local/');
     81}
     82
     83@include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php');
    7484if (!defined('PHPWG_INSTALLED'))
    7585{
     
    93103include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    94104@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
     105if (isset($conf['local_dir_site']))
     106{
     107  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');
     108}
    95109include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
    96110
     
    152166}
    153167trigger_action('loading_lang');
    154 load_language('lang', PHPWG_ROOT_PATH.'local/', array('no_fallback'=>true, 'local'=>true) );
     168load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) );
    155169
    156170// only now we can set the localized username of the guest user (and not in
Note: See TracChangeset for help on using the changeset viewer.