Dotclear

Changeset 9:ea9f75add9b1


Ignore:
Timestamp:
04/27/11 09:44:24 (15 years ago)
Author:
Dsls <dsls@…>
Branch:
userprefs
Parents:
4:def8fba8def4 (diff), 7:8e25b11db024 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with default (remove twig)

Location:
inc
Files:
124 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • inc/prepend.php

    r4 r9  
    2222 
    2323/* ------------------------------------------------------------------------------------------- */ 
    24 #  ClearBricks, Twig and DotClear classes auto-loader 
     24#  ClearBricks, DotClear classes auto-loader 
    2525if (@is_dir('/usr/lib/clearbricks')) { 
    2626     define('CLEARBRICKS_PATH','/usr/lib/clearbricks'); 
    … …  
    3333if (!defined('CLEARBRICKS_PATH') || !is_dir(CLEARBRICKS_PATH)) { 
    3434     exit('No clearbricks path defined'); 
    35 } 
    36  
    37 if (@is_dir('/usr/lib/twig')) { 
    38      define('TWIG_PATH','/usr/lib/twig'); 
    39 } elseif (is_dir(dirname(__FILE__).'/libs/twig')) { 
    40      define('TWIG_PATH',dirname(__FILE__).'/libs/twig'); 
    41 } elseif (isset($_SERVER['TWIG_PATH']) && is_dir($_SERVER['TWIG_PATH'])) { 
    42      define('TWIG_PATH',$_SERVER['TWIG_PATH']); 
    43 } 
    44  
    45 if (!defined('TWIG_PATH') || !is_dir(TWIG_PATH)) { 
    46      exit('No Twig path defined'); 
    4735} 
    4836 
    … …  
    8472$__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php'; 
    8573$__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php'; 
    86  
    87 require TWIG_PATH.'/Autoloader.php'; 
    88 Twig_Autoloader::register(); 
    8974 
    9075# Clearbricks extensions 

  • inc/prepend.php

    r7 r9  
    5353$__autoload['dcXmlRpc']                 = dirname(__FILE__).'/core/class.dc.xmlrpc.php'; 
    5454$__autoload['dcLog']                    = dirname(__FILE__).'/core/class.dc.log.php'; 
     55$__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php'; 
     56$__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php'; 
    5557 
    5658$__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php'; 
Note: See TracChangeset for help on using the changeset viewer.

Sites map