Changeset 1107:3943962d69b8 for plugins/attachments

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

Location:

plugins/attachments

Files:

• _admin.php (modified) (1 diff)
• _admin.php (modified) (1 diff)
• _public.php (modified) (1 diff)
• _public.php (modified) (2 diffs)

plugins/attachments/_admin.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
-
+/*
 $core->addBehavior ('adminPostFormSidebar',array('attachmentAdmin','adminPostFormSidebar'));
 $core->addBehavior ('adminPostAfterForm',array('attachmentAdmin','adminPostAfterForm'));
-
+*/
 class attachmentAdmin
 {

plugins/attachments/_admin.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
-
+/*
 $core->addBehavior ('adminPostFormSidebar',array('attachmentAdmin','adminPostFormSidebar'));
 $core->addBehavior ('adminPostAfterForm',array('attachmentAdmin','adminPostAfterForm'));
-
+*/
 class attachmentAdmin
 {

plugins/attachments/_public.php

@@ -89 +89 @@
           $if = array();
           
-          $operator = isset($attr['operator']) ? $this->getOperator($attr['operator']) : '&&';
+          $operator = isset($attr['operator']) ? dcTemplate::getOperator($attr['operator']) : '&&';
           
           if (isset($attr['is_image'])) {

plugins/attachments/_public.php

@@ -13 +13 @@
 
 # Attachments
-$core->tpl->addBlock('Attachments',array('attachmentTpl','Attachments'));
+/*$core->tpl->addBlock('Attachments',array('attachmentTpl','Attachments'));
 $core->tpl->addBlock('AttachmentsHeader',array('attachmentTpl','AttachmentsHeader'));
 $core->tpl->addBlock('AttachmentsFooter',array('attachmentTpl','AttachmentsFooter'));
@@ -29 +29 @@
 
 $core->addBehavior('tplIfConditions',array('attachmentBehavior','tplIfConditions'));
-
+*/
 class attachmentTpl {