Dotclear


Ignore:
Timestamp:
09/22/13 11:38:22 (12 years ago)
Author:
Dsls
Branch:
default
Parents:
1998:dae906985ebb (diff), 1905:d72d24250853 (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:

Fusion avec actionsreloaded

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • inc/prepend.php

    r1905 r1999  
    5959$__autoload['adminCommentList']         = dirname(__FILE__).'/admin/lib.pager.php'; 
    6060$__autoload['adminUserList']            = dirname(__FILE__).'/admin/lib.pager.php'; 
     61$__autoload['dcPager']        = dirname(__FILE__).'/admin/lib.pager.php'; 
    6162$__autoload['dcAdminCombos']            = dirname(__FILE__).'/admin/lib.admincombos.php'; 
    6263 
     
    291292     { 
    292293          if ($l == 'en' || l10n::set(dirname(__FILE__).'/../locales/'.$l.'/main') !== false) { 
     294               l10n::lang($l); 
    293295               break; 
    294296          } 
  • inc/prepend.php

    r1949 r1999  
    6565$__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php'; 
    6666$__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php'; 
     67$__autoload['dcPostsActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcactionposts.php'; 
     68$__autoload['dcCommentsActionsPage']              = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php'; 
     69$__autoload['dcActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcaction.php'; 
    6770 
    6871# Clearbricks extensions 
Note: See TracChangeset for help on using the changeset viewer.

Sites map