Dotclear


Ignore:
Timestamp:
10/04/13 09:19:33 (12 years ago)
Author:
Denis Jean-Chirstian <contact@…>
Branch:
dcRepo
Parents:
2237:911f18a5b287 (diff), 2239:cd7100fa57db (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 from default

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • inc/prepend.php

    r2216 r2240  
    4949$__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php'; 
    5050$__autoload['dcStoreParser']       = dirname(__FILE__).'/core/class.dc.store.parser.php'; 
     51$__autoload['dcFavorites']              = dirname(__FILE__).'/admin/class.dc.favorites.php'; 
    5152 
    5253$__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php'; 
  • inc/prepend.php

    r2236 r2240  
    4646$__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php'; 
    4747$__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php'; 
     48$__autoload['dcStore']             = dirname(__FILE__).'/core/class.dc.store.php'; 
     49$__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php'; 
     50$__autoload['dcStoreParser']       = dirname(__FILE__).'/core/class.dc.store.parser.php'; 
    4851$__autoload['dcFavorites']              = dirname(__FILE__).'/admin/class.dc.favorites.php'; 
    4952 
     
    6265$__autoload['dcPager']        = dirname(__FILE__).'/admin/lib.pager.php'; 
    6366$__autoload['dcAdminCombos']            = dirname(__FILE__).'/admin/lib.admincombos.php'; 
     67$__autoload['adminModulesList']              = dirname(__FILE__).'/admin/lib.moduleslist.php'; 
     68$__autoload['adminThemesList']               = dirname(__FILE__).'/admin/lib.moduleslist.php'; 
    6469 
    6570$__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php'; 
Note: See TracChangeset for help on using the changeset viewer.

Sites map