Dotclear


Ignore:
Timestamp:
02/27/13 11:48:32 (13 years ago)
Author:
JcDenis
Branch:
sexy
Parents:
880:02c78f56f430 (diff), 1105:ce855d61f9ce (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 branch in 2.5-RC

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • plugins/attachments/_admin.php

    r416 r1107  
    1111# -- END LICENSE BLOCK ----------------------------------------- 
    1212if (!defined('DC_CONTEXT_ADMIN')) { return; } 
    13  
     13/* 
    1414$core->addBehavior ('adminPostFormSidebar',array('attachmentAdmin','adminPostFormSidebar')); 
    1515$core->addBehavior ('adminPostAfterForm',array('attachmentAdmin','adminPostAfterForm')); 
    16  
     16*/ 
    1717class attachmentAdmin 
    1818{ 
  • plugins/attachments/_admin.php

    r416 r1107  
    1111# -- END LICENSE BLOCK ----------------------------------------- 
    1212if (!defined('DC_CONTEXT_ADMIN')) { return; } 
    13  
     13/* 
    1414$core->addBehavior ('adminPostFormSidebar',array('attachmentAdmin','adminPostFormSidebar')); 
    1515$core->addBehavior ('adminPostAfterForm',array('attachmentAdmin','adminPostAfterForm')); 
    16  
     16*/ 
    1717class attachmentAdmin 
    1818{ 
Note: See TracChangeset for help on using the changeset viewer.

Sites map