Ticket #1713 - core changes.

modules/base/text/classes/BxBaseModTextUploaderHTML5.php

@@ -22,8 +22,8 @@ class BxBaseModTextUploaderHTML5 extends BxTemplUploaderHTML5
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'])->addMarkers(array(
-            'js_object_uploader_html5' => $this->getNameJsInstanceUploader()
+        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'], $this->_oModule->_oTemplate)->addMarkers(array(
+            'js_object_uploader' . str_replace($this->_sModule, '', $this->_aObject['object']) => $this->getNameJsInstanceUploader()
         ));
     }
 }

modules/base/text/classes/BxBaseModTextUploaderSimple.php

@@ -22,7 +22,7 @@ class BxBaseModTextUploaderSimple extends BxTemplUploaderSimple
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'])->addMarkers(array(
+        BxDolMenu::getObjectInstance($CNF['OBJECT_MENU_ENTRY_ATTACHMENTS'], $this->_oModule->_oTemplate)->addMarkers(array(
             'js_object_uploader' . str_replace($this->_sModule, '', $this->_aObject['object']) => $this->getNameJsInstanceUploader()
         ));
     }

modules/boonex/timeline/template/menu_buttons_hor.html

@@ -1,10 +0,0 @@
-<ul class="bx-menu-btns-hor bx-menu-object-__object__ bx-clearfix">
-    <bx_repeat:menu_items>
-        <li class="bx-menu-btn __name__ bx-def-margin-sec-left-auto __class_add__">
-            <a class="bx-btn __name__" href="__link__" target="__target__" onclick="__onclick__" title="__title__">
-                <bx_if:image><img style="background-image:url(__icon_url__)" src="<bx_icon_url:spacer.gif />" /></bx_if:image>
-                <bx_if:icon><i class="sys-icon __icon__"></i></bx_if:icon>
-            </a>
-        </li>
-    </bx_repeat:menu_items>
-</ul>