Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php

1 files changed, 1 insertions, 16 deletions

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
index d62a219e6..9c99995ad 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js
@@ -53,7 +53,6 @@ function insertAction() {
 	var inst = tinyMCEPopup.editor;

 	var elm = inst.selection.getNode();

 

-	tinyMCEPopup.execCommand("mceBeginUndoLevel");	

 	setAllAttribs(elm);

 	tinyMCEPopup.execCommand("mceEndUndoLevel");

 	tinyMCEPopup.close();

@@ -72,21 +71,7 @@ function setAttrib(elm, attrib, value) {
 			value = valueElm.value;

 	}

 

-	if (value != "") {

-		dom.setAttrib(elm, attrib.toLowerCase(), value);

-

-		if (attrib == "style")

-			attrib = "style.cssText";

-

-		if (attrib.substring(0, 2) == 'on')

-			value = 'return true;' + value;

-

-		if (attrib == "class")

-			attrib = "className";

-

-		elm[attrib]=value;

-	} else

-		elm.removeAttribute(attrib);

+	dom.setAttrib(elm, attrib.toLowerCase(), value);

 }

 

 function setAllAttribs(elm) {